chore: cargo fmt

Cargo.lock

@@ -93,7 +93,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -104,7 +104,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -135,7 +135,7 @@ dependencies = [
  "hex",
  "http",
  "hyper",
- "ring",
+ "ring 0.16.20",
  "time",
  "tokio",
  "tower",
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "base64-simd"
@@ -663,9 +663,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -673,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
 dependencies = [
  "anstream",
  "anstyle",
@@ -685,21 +685,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "colorchoice"
@@ -725,9 +725,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -791,9 +791,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
 dependencies = [
  "libc",
  "windows-sys",
@@ -822,47 +822,47 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -885,9 +885,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "libc",
@@ -933,9 +933,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 = "headers"
@@ -1048,7 +1048,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -1057,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http",
@@ -1093,12 +1093,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
@@ -1109,9 +1109,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1130,9 +1130,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libloading"
@@ -1205,9 +1205,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "wasi",
@@ -1348,7 +1348,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1405,7 +1405,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1558,12 +1558,26 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin",
- "untrusted",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -1587,9 +1601,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.20"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
@@ -1600,12 +1614,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.5",
  "rustls-webpki",
  "sct",
 ]
@@ -1633,12 +1647,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.6"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.5",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -1664,12 +1678,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.5",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -1703,29 +1717,29 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -1746,11 +1760,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.25"
+version = "0.9.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -1794,15 +1808,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -1820,9 +1825,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[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",
@@ -1830,9 +1835,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",
@@ -1844,6 +1849,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -1869,9 +1880,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1880,22 +1891,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",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1962,10 +1973,8 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
- "parking_lot",
  "pin-project-lite",
- "signal-hook-registry",
- "socket2 0.5.4",
+ "socket2 0.5.5",
  "tokio-macros",
  "windows-sys",
 ]
@@ -1978,7 +1987,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2016,9 +2025,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2030,9 +2039,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 
 [[package]]
 name = "toml_edit"
@@ -2040,7 +2049,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "toml_datetime",
  "winnow",
 ]
@@ -2093,7 +2102,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2108,12 +2117,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
@@ -2213,6 +2222,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.4.1"
@@ -2244,9 +2259,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 
 [[package]]
 name = "valuable"
@@ -2283,9 +2298,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -2293,24 +2308,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2318,28 +2333,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2466,9 +2481,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.5.17"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
 dependencies = [
  "memchr",
 ]

Cargo.toml

@@ -4,19 +4,19 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-aws-config= { version = "0.56.1" }
-aws-sdk-transcribestreaming= { version = "0.34" }
+aws-config = "0.56"
+aws-sdk-transcribestreaming = "0.34"
 aws-sdk-translate = "0.34"
 aws-sdk-polly = "0.34"
-clap = { version = "4.4" , features = ["derive"]}
-tokio = {  version = "1.33" , features = ["full"] }
+clap = { version = "4.4", features = ["derive"] }
+tokio = { version = "1.33", features = ["macros", "rt-multi-thread", "sync"] }
 tokio-stream = "0.1"
 async-stream = "0.3"
 futures-util = "0.3"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0" }
+serde_json = "1.0"
 serde_yaml = "0.9"
-whisper-rs = {  version = "0.8" }
+whisper-rs = "0.8"
 whisper-rs-sys = "0.6"
 tracing = "0.1"
 tracing-subscriber = "0.3"

src/config.rs

@@ -1,7 +1,7 @@
+use lazy_static::lazy_static;
+use serde::Deserialize;
 use std::ffi::c_int;
 use std::net::IpAddr;
-use lazy_static::lazy_static;
-use serde::{Deserialize};
 use whisper_rs::FullParams;
 
 #[derive(Debug)]
@@ -12,9 +12,9 @@ pub enum Error {
 
 pub(crate) fn load_config() -> Result<Config, Error> {
     let config_str = std::fs::read_to_string("config.yaml").map_err(|e| Error::IoError(e))?;
-    let config: Config = serde_yaml::from_str(config_str.as_str())
-        .map_err(|e| Error::ConfigError(e))?;
-    return Ok(config)
+    let config: Config =
+        serde_yaml::from_str(config_str.as_str()).map_err(|e| Error::ConfigError(e))?;
+    return Ok(config);
 }
 
 lazy_static! {
@@ -49,7 +49,7 @@ pub(crate) struct WhisperParams {
     pub(crate) language: Option<String>,
 }
 
-const NONE: [c_int;0] = [];
+const NONE: [c_int; 0] = [];
 
 impl WhisperParams {
     pub(crate) fn to_full_params<'a, 'b>(&'a self, tokens: &'b [c_int]) -> FullParams<'a, 'b> {
@@ -63,7 +63,9 @@ impl WhisperParams {
         param.set_max_tokens(self.max_tokens as i32);
         let lang = self.language.as_ref().map(|s| s.as_str());
         param.set_language(lang);
-        let num_cpus = std::thread::available_parallelism().map(|c| c.get()).unwrap_or(4);
+        let num_cpus = std::thread::available_parallelism()
+            .map(|c| c.get())
+            .unwrap_or(4);
         param.set_n_threads(self.n_threads.unwrap_or(num_cpus) as c_int);
         param.set_audio_ctx(self.audio_ctx as i32);
         param.set_speed_up(self.speed_up);
@@ -89,8 +91,11 @@ pub struct Config {
 mod tests {
     #[tokio::test]
     async fn load() {
-        let config_str = tokio::fs::read_to_string("config.yaml").await.expect("failed to read config file");
-        let params: crate::config::Config = serde_yaml::from_str(config_str.as_str()).expect("failed to parse config file");
+        let config_str = tokio::fs::read_to_string("config.yaml")
+            .await
+            .expect("failed to read config file");
+        let params: crate::config::Config =
+            serde_yaml::from_str(config_str.as_str()).expect("failed to parse config file");
         println!("{:?}", params);
     }
-}
+}

src/group.rs

@@ -1,21 +1,27 @@
 use std::collections::VecDeque;
 use std::time::Duration;
-use tokio::{select};
-use tokio::time::sleep;
-use tokio::sync::mpsc::{Receiver, channel};
+use tokio::select;
 use tokio::sync::mpsc::error::TryRecvError;
+use tokio::sync::mpsc::{channel, Receiver};
+use tokio::time::sleep;
 
 pub struct GroupedWithin<I>
-where I: 'static + Send {
-    outlet: Receiver<Vec<I>>
+where
+    I: 'static + Send,
+{
+    outlet: Receiver<Vec<I>>,
 }
 
 impl<I> GroupedWithin<I>
-where I: 'static + Send {
-    pub fn new(group_size: usize,
-               window_time: Duration,
-               mut inlet: Receiver<Vec<I>>,
-               buffer: usize) -> Self {
+where
+    I: 'static + Send,
+{
+    pub fn new(
+        group_size: usize,
+        window_time: Duration,
+        mut inlet: Receiver<Vec<I>>,
+        buffer: usize,
+    ) -> Self {
         let (tx, outlet) = channel::<Vec<I>>(buffer);
         tokio::spawn(async move {
             let mut window = VecDeque::with_capacity(group_size);
@@ -26,10 +32,10 @@ where I: 'static + Send {
                         window.extend(c);
                         if window.len() >= group_size {
                             let will_send: Vec<I> = window.drain(0..group_size).collect();
-                            return Some(will_send)
+                            return Some(will_send);
                         }
                     }
-                    return None
+                    return None;
                 };
 
                 let grouped: Vec<I> = select! {
@@ -45,7 +51,7 @@ where I: 'static + Send {
                 };
 
                 if grouped.is_empty() {
-                    continue
+                    continue;
                 }
 
                 if let Err(e) = tx.send(grouped).await {
@@ -53,12 +59,10 @@ where I: 'static + Send {
                 }
             }
         });
-        Self {
-            outlet
-        }
+        Self { outlet }
     }
 
     pub fn next(&mut self) -> Result<Vec<I>, TryRecvError> {
         self.outlet.try_recv()
     }
-}
+}

src/lesson.rs

@@ -1,19 +1,21 @@
-use std::sync::{Arc, Weak};
-use tokio::sync::RwLock;
-use std::collections::BTreeMap;
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-use std::io::BufRead;
 use async_stream::stream;
 use aws_config::SdkConfig;
 use aws_sdk_polly::primitives::ByteStream;
 use aws_sdk_polly::types::{Engine, OutputFormat, SpeechMarkType, VoiceId};
 use aws_sdk_transcribestreaming::operation::start_stream_transcription::StartStreamTranscriptionOutput;
 use aws_sdk_transcribestreaming::primitives::Blob;
-use aws_sdk_transcribestreaming::types::{AudioEvent, AudioStream, LanguageCode, MediaEncoding, TranscriptResultStream};
-use futures_util::{Stream, StreamExt, TryStreamExt};
+use aws_sdk_transcribestreaming::types::{
+    AudioEvent, AudioStream, LanguageCode, MediaEncoding, TranscriptResultStream,
+};
 use futures_util::future::try_join;
+use futures_util::{Stream, StreamExt, TryStreamExt};
 use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+use std::error::Error;
+use std::fmt::{Display, Formatter};
+use std::io::BufRead;
+use std::sync::{Arc, Weak};
+use tokio::sync::RwLock;
 
 use tokio::select;
 
@@ -22,7 +24,7 @@ pub struct LessonsManager {
     translate_client: aws_sdk_translate::Client,
     polly_client: aws_sdk_polly::Client,
     transcript_client: aws_sdk_transcribestreaming::Client,
-    lessons: Arc<RwLock<BTreeMap<u32, Lesson>>>
+    lessons: Arc<RwLock<BTreeMap<u32, Lesson>>>,
 }
 
 impl LessonsManager {
@@ -34,13 +36,11 @@ impl LessonsManager {
             translate_client,
             polly_client,
             transcript_client,
-            lessons: Arc::new(RwLock::new(BTreeMap::new()))
+            lessons: Arc::new(RwLock::new(BTreeMap::new())),
         }
     }
 
-    pub(crate) async fn create_lesson(&self,
-                                      id: u32,
-                                      speaker_lang: LanguageCode) -> Lesson {
+    pub(crate) async fn create_lesson(&self, id: u32, speaker_lang: LanguageCode) -> Lesson {
         let mut map = self.lessons.write().await;
         let lesson: Lesson = InnerLesson::new(self.clone(), speaker_lang).into();
         map.insert(id, lesson.clone());
@@ -55,7 +55,7 @@ impl LessonsManager {
 
 #[derive(Clone, Debug)]
 pub(crate) struct Lesson {
-    inner: Arc<InnerLesson>
+    inner: Arc<InnerLesson>,
 }
 
 impl Lesson {
@@ -71,10 +71,7 @@ impl Lesson {
             if let Some(lang_lesson) = map.get(&lang).and_then(|weak| weak.upgrade()) {
                 lang_lesson.into()
             } else {
-                let lang_lesson = LangLesson::new(
-                    self.clone(),
-                    lang.clone(),
-                );
+                let lang_lesson = LangLesson::new(self.clone(), lang.clone());
                 map.insert(lang.clone(), Arc::downgrade(&lang_lesson.inner));
                 lang_lesson
             }
@@ -93,7 +90,7 @@ impl Lesson {
 impl From<InnerLesson> for Lesson {
     fn from(inner: InnerLesson) -> Self {
         Lesson {
-            inner: Arc::new(inner)
+            inner: Arc::new(inner),
         }
     }
 }
@@ -109,10 +106,7 @@ struct InnerLesson {
 }
 
 impl InnerLesson {
-    fn new(
-        parent: LessonsManager,
-        speaker_lang: LanguageCode
-    ) -> InnerLesson {
+    fn new(parent: LessonsManager, speaker_lang: LanguageCode) -> InnerLesson {
         let (speaker_transcript, _) = tokio::sync::broadcast::channel::<String>(128);
         let shared_speaker_transcript = speaker_transcript.clone();
         let (speaker_voice_channel, mut speaker_voice_rx) = tokio::sync::mpsc::channel(128);
@@ -129,7 +123,7 @@ impl InnerLesson {
                 };
                 let output = transcript_client
                     .start_stream_transcription()
-                    .language_code(shared_speak_lang)//LanguageCode::EnGb
+                    .language_code(shared_speak_lang) //LanguageCode::EnGb
                     .media_sample_rate_hertz(16000)
                     .media_encoding(MediaEncoding::Pcm)
                     .audio_stream(input_stream.into())
@@ -175,7 +169,6 @@ impl Drop for InnerLesson {
     }
 }
 
-
 struct InnerLangLesson {
     parent: Lesson,
     translated_tx: tokio::sync::broadcast::Sender<String>,
@@ -193,7 +186,7 @@ impl Drop for InnerLangLesson {
 
 #[derive(Clone)]
 pub(crate) struct LangLesson {
-    inner: Arc<InnerLangLesson>
+    inner: Arc<InnerLangLesson>,
 }
 
 impl LangLesson {
@@ -205,24 +198,19 @@ impl LangLesson {
 impl From<InnerLangLesson> for LangLesson {
     fn from(inner: InnerLangLesson) -> Self {
         LangLesson {
-            inner: Arc::new(inner)
+            inner: Arc::new(inner),
         }
     }
 }
 
 impl From<Arc<InnerLangLesson>> for LangLesson {
     fn from(inner: Arc<InnerLangLesson>) -> Self {
-        LangLesson {
-            inner
-        }
+        LangLesson { inner }
     }
 }
 
 impl LangLesson {
-    fn new(
-        parent: Lesson,
-        lang: String,
-    ) -> Self {
+    fn new(parent: Lesson, lang: String) -> Self {
         let shared_lang = lang.clone();
         let shared_speaker_lang = parent.inner.speaker_lang.clone();
         let (translated_tx, _) = tokio::sync::broadcast::channel::<String>(128);
@@ -245,7 +233,7 @@ impl LangLesson {
                             if let Some(translated) = res.translated_text {
                                 let _ = shared_translated_tx.send(translated);
                             }
-                        },
+                        }
                         Err(e) => {
                             return Err(e);
                         }
@@ -268,7 +256,8 @@ impl LangLesson {
             translated_tx,
             voice_lessons: RwLock::new(BTreeMap::new()),
             drop_handler: Some(drop_handler),
-        }.into()
+        }
+        .into()
     }
 
     pub(crate) async fn get_or_init(&mut self, voice: VoiceId) -> VoiceLesson {
@@ -284,10 +273,7 @@ impl LangLesson {
             if let Some(voice_lesson) = map.get(&voice).and_then(|weak| weak.upgrade()) {
                 voice_lesson.into()
             } else {
-                let voice_lesson = Arc::new(InnerVoiceLesson::new(
-                    self.clone(),
-                    voice.clone(),
-                ));
+                let voice_lesson = Arc::new(InnerVoiceLesson::new(self.clone(), voice.clone()));
                 map.insert(voice, Arc::downgrade(&voice_lesson));
                 voice_lesson.into()
             }
@@ -297,7 +283,7 @@ impl LangLesson {
 
 #[derive(Clone)]
 pub(crate) struct VoiceLesson {
-    inner: Arc<InnerVoiceLesson>
+    inner: Arc<InnerVoiceLesson>,
 }
 
 impl VoiceLesson {
@@ -313,16 +299,14 @@ impl VoiceLesson {
 impl From<InnerVoiceLesson> for VoiceLesson {
     fn from(inner: InnerVoiceLesson) -> Self {
         VoiceLesson {
-            inner: Arc::new(inner)
+            inner: Arc::new(inner),
         }
     }
 }
 
 impl From<Arc<InnerVoiceLesson>> for VoiceLesson {
     fn from(inner: Arc<InnerVoiceLesson>) -> Self {
-        VoiceLesson {
-            inner
-        }
+        VoiceLesson { inner }
     }
 }
 
@@ -338,10 +322,7 @@ enum Signal {
 }
 
 impl InnerVoiceLesson {
-    fn new(
-        parent: LangLesson,
-        voice: VoiceId,
-    ) -> InnerVoiceLesson {
+    fn new(parent: LangLesson, voice: VoiceId) -> InnerVoiceLesson {
         let shared_voice_id: VoiceId = voice.clone();
         let (tx, rx) = tokio::sync::oneshot::channel::<Signal>();
         let mut translate_rx = parent.inner.translated_tx.subscribe();
@@ -361,7 +342,7 @@ impl InnerVoiceLesson {
                             while let Some(Ok(bytes)) = audio_stream.next().await {
                                 let _ = &shared_voice_lesson.send(bytes.to_vec());
                             }
-                        },
+                        }
                         Err(e) => {
                             return Err(e);
                         }
@@ -396,8 +377,9 @@ impl Drop for InnerVoiceLesson {
     }
 }
 
-
-fn to_stream(mut output: StartStreamTranscriptionOutput) -> impl Stream<Item=Result<String, StreamTranscriptionError>> {
+fn to_stream(
+    mut output: StartStreamTranscriptionOutput,
+) -> impl Stream<Item = Result<String, StreamTranscriptionError>> {
     stream! {
         while let Some(event) = output
             .transcript_result_stream
@@ -434,16 +416,20 @@ enum SynthesizeError {
     Transmitting(aws_sdk_polly::error::BoxError),
 }
 
-async fn synthesize_speech(client: &aws_sdk_polly::Client,
-                           text: String,
-                           voice_id: VoiceId) -> Result<(Vec<Viseme>, ByteStream), SynthesizeError> {
-    let audio_fut = client.synthesize_speech()
+async fn synthesize_speech(
+    client: &aws_sdk_polly::Client,
+    text: String,
+    voice_id: VoiceId,
+) -> Result<(Vec<Viseme>, ByteStream), SynthesizeError> {
+    let audio_fut = client
+        .synthesize_speech()
         .engine(Engine::Neural)
         .set_text(Some(text.clone()))
         .voice_id(voice_id.clone())
         .output_format(OutputFormat::Pcm)
         .send();
-    let visemes_fut = client.synthesize_speech()
+    let visemes_fut = client
+        .synthesize_speech()
         .engine(Engine::Neural)
         .set_text(Some(text))
         .voice_id(voice_id)
@@ -453,8 +439,12 @@ async fn synthesize_speech(client: &aws_sdk_polly::Client,
     let (audio, visemes) = try_join(audio_fut, visemes_fut)
         .await
         .map_err(|e| SynthesizeError::Polly(e.into()))?;
-    let visemes = visemes.audio_stream.collect().await
-        .map_err(|e| SynthesizeError::Transmitting(e.into()))?.to_vec();
+    let visemes = visemes
+        .audio_stream
+        .collect()
+        .await
+        .map_err(|e| SynthesizeError::Transmitting(e.into()))?
+        .to_vec();
     let parsed: Vec<Viseme> = visemes
         .lines()
         .filter_map(|line| line.ok())
@@ -463,20 +453,22 @@ async fn synthesize_speech(client: &aws_sdk_polly::Client,
     Ok((parsed, audio.audio_stream))
 }
 
-
 #[derive(Debug)]
 enum StreamTranscriptionError {
     EstablishStreamError(Box<dyn Error + Send + Sync>),
     TranscriptResultStreamError(Box<dyn Error + Send + Sync>),
-    Unknown
+    Unknown,
 }
 
-
 impl Display for StreamTranscriptionError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            StreamTranscriptionError::EstablishStreamError(e) => write!(f, "EstablishStreamError: {}", e),
-            StreamTranscriptionError::TranscriptResultStreamError(e) => write!(f, "TranscriptResultStreamError: {}", e),
+            StreamTranscriptionError::EstablishStreamError(e) => {
+                write!(f, "EstablishStreamError: {}", e)
+            }
+            StreamTranscriptionError::TranscriptResultStreamError(e) => {
+                write!(f, "TranscriptResultStreamError: {}", e)
+            }
             StreamTranscriptionError::Unknown => write!(f, "Unknown"),
         }
     }
@@ -491,4 +483,3 @@ impl Error for StreamTranscriptionError {
         }
     }
 }
-

src/main.rs

@@ -5,30 +5,29 @@
 
 #![allow(clippy::result_large_err)]
 
-use std::default::Default;
 use aws_config::meta::region::RegionProviderChain;
 use aws_sdk_transcribestreaming::{config::Region, meta::PKG_VERSION};
 use clap::Parser;
+use std::default::Default;
 
-use poem::{EndpointExt, get, handler, IntoResponse, listener::TcpListener, Route, Server};
-use futures_util::{SinkExt};
+use futures_util::stream::StreamExt;
+use futures_util::SinkExt;
 use poem::endpoint::{StaticFileEndpoint, StaticFilesEndpoint};
 use poem::web::websocket::{Message, WebSocket};
-use futures_util::stream::StreamExt;
 use poem::web::{Data, Query};
+use poem::{get, handler, listener::TcpListener, EndpointExt, IntoResponse, Route, Server};
 
-use tokio::{select};
-use serde::{Deserialize, Serialize};
-use lesson::{LessonsManager};
 use crate::config::CONFIG;
 use crate::lesson::Viseme;
 use crate::whisper::WhisperHandler;
+use lesson::LessonsManager;
+use serde::{Deserialize, Serialize};
+use tokio::select;
 
-mod lesson;
 mod config;
-mod whisper;
 mod group;
-
+mod lesson;
+mod whisper;
 
 #[derive(Debug, Parser)]
 struct Opt {
@@ -42,14 +41,11 @@ struct Context {
     lessons_manager: LessonsManager,
 }
 
-
 #[tokio::main]
 async fn main() -> Result<(), std::io::Error> {
     tracing_subscriber::fmt::init();
 
-    let Opt {
-        region,
-    } = Opt::parse();
+    let Opt { region } = Opt::parse();
 
     let region_provider = RegionProviderChain::first_try(region.map(Region::new))
         .or_default_provider()
@@ -70,15 +66,21 @@ async fn main() -> Result<(), std::io::Error> {
 
     let app = Route::new()
         .nest(
-        "/",
-        StaticFilesEndpoint::new("./static")
-            .show_files_listing()
-            .index_file("index.html"),
+            "/",
+            StaticFilesEndpoint::new("./static")
+                .show_files_listing()
+                .index_file("index.html"),
         )
         .at("/ws/lesson-speaker", get(stream_speaker))
         .at("/ws/lesson-listener", get(stream_listener))
-        .at("lesson-speaker", StaticFileEndpoint::new("./static/index.html"))
-        .at("lesson-listener", StaticFileEndpoint::new("./static/index.html"))
+        .at(
+            "lesson-speaker",
+            StaticFileEndpoint::new("./static/index.html"),
+        )
+        .at(
+            "lesson-listener",
+            StaticFileEndpoint::new("./static/index.html"),
+        )
         .data(ctx);
     let addr = format!("{}:{}", CONFIG.server.host, CONFIG.server.port);
     let listener = TcpListener::bind(addr);
@@ -87,7 +89,6 @@ async fn main() -> Result<(), std::io::Error> {
     server.run(app).await
 }
 
-
 #[derive(Deserialize, Debug)]
 pub struct LessonSpeakerQuery {
     id: u32,
@@ -96,14 +97,25 @@ pub struct LessonSpeakerQuery {
 }
 
 #[handler]
-async fn stream_speaker(ctx: Data<&Context>, query: Query<LessonSpeakerQuery>, ws: WebSocket) -> impl IntoResponse {
-    let lesson = ctx.lessons_manager.create_lesson(query.id, query.lang.clone().parse().expect("Not supported lang")).await;
+async fn stream_speaker(
+    ctx: Data<&Context>,
+    query: Query<LessonSpeakerQuery>,
+    ws: WebSocket,
+) -> impl IntoResponse {
+    let lesson = ctx
+        .lessons_manager
+        .create_lesson(
+            query.id,
+            query.lang.clone().parse().expect("Not supported lang"),
+        )
+        .await;
     let prompt = query.prompt.clone().unwrap_or_default();
 
     ws.on_upgrade(|mut socket| async move {
         let origin_tx = lesson.voice_channel();
         let mut transcribe_rx = lesson.transcript_channel();
-        let whisper = WhisperHandler::new(CONFIG.whisper.clone(), prompt).expect("failed to create whisper");
+        let whisper =
+            WhisperHandler::new(CONFIG.whisper.clone(), prompt).expect("failed to create whisper");
         let mut whisper_transcribe_rx = whisper.subscribe();
         loop {
             select! {
@@ -149,7 +161,6 @@ async fn stream_speaker(ctx: Data<&Context>, query: Query<LessonSpeakerQuery>, w
     })
 }
 
-
 #[derive(Deserialize, Debug)]
 pub struct LessonListenerQuery {
     id: u32,
@@ -162,11 +173,15 @@ pub struct LessonListenerQuery {
 enum LiveLessonTextEvent {
     Transcription { text: String },
     Translation { text: String },
-    LipSync{ visemes: Vec<Viseme> },
+    LipSync { visemes: Vec<Viseme> },
 }
 
 #[handler]
-async fn stream_listener(ctx: Data<&Context>, query: Query<LessonListenerQuery>, ws: WebSocket) -> impl IntoResponse {
+async fn stream_listener(
+    ctx: Data<&Context>,
+    query: Query<LessonListenerQuery>,
+    ws: WebSocket,
+) -> impl IntoResponse {
     let lesson_opt = ctx.lessons_manager.get_lesson(query.id).await;
     tracing::debug!("listener param = {:?}", query);
 
@@ -174,13 +189,17 @@ async fn stream_listener(ctx: Data<&Context>, query: Query<LessonListenerQuery>,
         let voice_id = match query.voice.parse() {
             Ok(id) => id,
             Err(e) => {
-                let _ = socket.send(Message::Text(format!("invalid voice id: {}", e))).await;
-                return
+                let _ = socket
+                    .send(Message::Text(format!("invalid voice id: {}", e)))
+                    .await;
+                return;
             }
         };
         let Some(lesson) = lesson_opt else {
-            let _ = socket.send(Message::Text("lesson not found".to_string())).await;
-            return
+            let _ = socket
+                .send(Message::Text("lesson not found".to_string()))
+                .await;
+            return;
         };
         let mut transcript_rx = lesson.transcript_channel();
         let mut lang_lesson = lesson.get_or_init(query.lang.clone()).await;

src/whisper.rs

@@ -1,20 +1,18 @@
+use crate::config::{WhisperConfig, CONFIG};
+use crate::group::GroupedWithin;
+use lazy_static::lazy_static;
 use std::collections::VecDeque;
 use std::ffi::c_int;
 use std::fmt::{Debug, Display, Formatter};
 use std::thread::sleep;
 use std::time::Duration;
-use lazy_static::lazy_static;
 use tokio::sync::{broadcast, mpsc, oneshot};
-use whisper_rs::{convert_integer_to_float_audio, WhisperState, WhisperContext, WhisperToken};
+use whisper_rs::{convert_integer_to_float_audio, WhisperContext, WhisperState, WhisperToken};
 use whisper_rs_sys::WHISPER_SAMPLE_RATE;
-use crate::config::{CONFIG, WhisperConfig};
-use crate::group::GroupedWithin;
 
 lazy_static! {
-    static ref WHISPER_CONTEXT: WhisperContext = {
-        WhisperContext::new(&*CONFIG.whisper.model)
-            .expect("failed to create WhisperContext")
-    };
+    static ref WHISPER_CONTEXT: WhisperContext =
+        { WhisperContext::new(&*CONFIG.whisper.model).expect("failed to create WhisperContext") };
 }
 
 #[derive(Debug)]
@@ -84,7 +82,8 @@ impl WhisperHandler {
         let (pcm_tx, pcm_rx) = mpsc::channel::<Vec<u8>>(128);
         let (transcription_tx, _) = broadcast::channel::<Vec<Segment>>(128);
         let shared_transcription_tx = transcription_tx.clone();
-        let state = WHISPER_CONTEXT.create_state()
+        let state = WHISPER_CONTEXT
+            .create_state()
             .map_err(|e| Error::whisper_error("failed to create WhisperState", e))?;
         let preset_prompt_tokens = WHISPER_CONTEXT
             .tokenize(prompt.as_str(), CONFIG.whisper.max_prompt_tokens)
@@ -95,46 +94,46 @@ impl WhisperHandler {
                 detector.n_samples_step * 2,
                 Duration::from_millis(config.step_ms as u64),
                 pcm_rx,
-                u16::MAX as usize
+                u16::MAX as usize,
             );
             while let Err(oneshot::error::TryRecvError::Empty) = stop_signal.try_recv() {
                 let new_pcm_f32 = match grouped.next() {
                     Err(mpsc::error::TryRecvError::Disconnected) => break,
                     Err(mpsc::error::TryRecvError::Empty) => {
                         sleep(Duration::from_millis(10));
-                        continue
-                    }
-                    Ok(data) => {
-                        pcm_i16_to_f32(&data)
+                        continue;
                     }
+                    Ok(data) => pcm_i16_to_f32(&data),
                 };
 
                 detector.feed(new_pcm_f32);
                 let segments = match detector.inference() {
                     Ok(result) => {
                         if result.is_empty() {
-                            continue
+                            continue;
                         }
                         result
                     }
                     Err(err) => {
                         tracing::warn!("failed to inference: {}", err);
-                        continue
+                        continue;
                     }
                 };
 
                 if tracing::enabled!(tracing::Level::TRACE) {
                     for segment in segments.iter() {
-                        tracing::trace!("[{}-{}]s SEGMENT: {}",
+                        tracing::trace!(
+                            "[{}-{}]s SEGMENT: {}",
                             segment.start_timestamp as f32 / 1000.0,
                             segment.end_timestamp as f32 / 1000.0,
-                            segment.text);
+                            segment.text
+                        );
                     }
                 }
 
                 if let Err(e) = shared_transcription_tx.send(segments) {
                     tracing::error!("failed to send transcription: {}", e);
-                    break
+                    break;
                 };
             }
         });
@@ -168,10 +167,11 @@ struct Detector {
 }
 
 impl Detector {
-    fn new(state: WhisperState<'static>,
-           config: &'static WhisperConfig,
-           preset_prompt_tokens: Vec<WhisperToken>) -> Self {
-
+    fn new(
+        state: WhisperState<'static>,
+        config: &'static WhisperConfig,
+        preset_prompt_tokens: Vec<WhisperToken>,
+    ) -> Self {
         Detector {
             state,
             config,
@@ -182,51 +182,71 @@ impl Detector {
             prompt_tokens: Default::default(),
             pcm_f32: VecDeque::from(vec![0f32; 30 * WHISPER_SAMPLE_RATE as usize]),
             offset: 0,
-            stable_offset: 0
+            stable_offset: 0,
         }
     }
 
     fn feed(&mut self, new_pcm_f32: Vec<f32>) {
         self.pcm_f32.extend(new_pcm_f32);
         if self.pcm_f32.len() < self.n_samples_len {
-            return
+            return;
         }
-        let len_to_drain = self.pcm_f32.drain(0..(self.pcm_f32.len() - self.n_samples_len)).len();
+        let len_to_drain = self
+            .pcm_f32
+            .drain(0..(self.pcm_f32.len() - self.n_samples_len))
+            .len();
         self.offset += len_to_drain;
     }
 
     fn inference(&mut self) -> Result<Vec<Segment>, Error> {
-        let prompt_tokens = [self.preset_prompt_tokens.as_slice(), self.prompt_tokens.as_slice()].concat();
+        let prompt_tokens = [
+            self.preset_prompt_tokens.as_slice(),
+            self.prompt_tokens.as_slice(),
+        ]
+        .concat();
         let params = self.config.params.to_full_params(prompt_tokens.as_slice());
         let start = std::time::Instant::now();
-        let _ = self.state.full(params, self.pcm_f32.make_contiguous())
+        let _ = self
+            .state
+            .full(params, self.pcm_f32.make_contiguous())
             .map_err(|e| Error::whisper_error("failed to initialize WhisperState", e))?;
         let end = std::time::Instant::now();
         if end - start > Duration::from_millis(self.config.step_ms as u64) {
-            tracing::warn!("full([{}]) took {} ms too slow", self.pcm_f32.len(), (end - start).as_millis());
+            tracing::warn!(
+                "full([{}]) took {} ms too slow",
+                self.pcm_f32.len(),
+                (end - start).as_millis()
+            );
         }
 
         let timestamp_offset: i64 = (self.offset * 1000 / WHISPER_SAMPLE_RATE as usize) as i64;
         let stable_offset: i64 = (self.stable_offset * 1000 / WHISPER_SAMPLE_RATE as usize) as i64;
-        let num_segments = self.state
+        let num_segments = self
+            .state
             .full_n_segments()
             .map_err(|e| Error::whisper_error("failed to get number of segments", e))?;
         let mut segments: Vec<Segment> = Vec::with_capacity(num_segments as usize);
         for i in 0..num_segments {
-            let end_timestamp: i64 = timestamp_offset + 10 * self.state
-                .full_get_segment_t1(i)
-                .map_err(|e| Error::whisper_error("failed to get end timestamp", e))?;
+            let end_timestamp: i64 = timestamp_offset
+                + 10 * self
+                    .state
+                    .full_get_segment_t1(i)
+                    .map_err(|e| Error::whisper_error("failed to get end timestamp", e))?;
             if end_timestamp <= stable_offset {
-                continue
+                continue;
             }
 
-            let start_timestamp: i64 = timestamp_offset + 10 * self.state
-                .full_get_segment_t0(i)
-                .map_err(|e| Error::whisper_error("failed to get start timestamp", e))?;
-            let segment = self.state
+            let start_timestamp: i64 = timestamp_offset
+                + 10 * self
+                    .state
+                    .full_get_segment_t0(i)
+                    .map_err(|e| Error::whisper_error("failed to get start timestamp", e))?;
+            let segment = self
+                .state
                 .full_get_segment_text(i)
                 .map_err(|e| Error::whisper_error("failed to get segment", e))?;
-            let num_tokens = self.state
+            let num_tokens = self
+                .state
                 .full_n_tokens(i)
                 .map_err(|e| Error::whisper_error("failed to get segment tokens", e))?;
             let mut segment_tokens = Vec::with_capacity(num_tokens as usize);
@@ -234,22 +254,28 @@ impl Detector {
                 segment_tokens.push(
                     self.state
                         .full_get_token_id(i, j)
-                        .map_err(|e| Error::whisper_error("failed to get token", e))?
+                        .map_err(|e| Error::whisper_error("failed to get token", e))?,
                 );
             }
 
-            segments.push(Segment { start_timestamp, end_timestamp, text: segment.trim().to_string(), tokens: segment_tokens });
+            segments.push(Segment {
+                start_timestamp,
+                end_timestamp,
+                text: segment.trim().to_string(),
+                tokens: segment_tokens,
+            });
         }
 
         let Some((_last, init)) = segments.split_last() else {
-            return Ok(Vec::default())
+            return Ok(Vec::default());
         };
 
         let Some((last_2_seg, _)) = init.split_last() else {
-            return Ok(Vec::default())
+            return Ok(Vec::default());
         };
 
-        let offset = (last_2_seg.end_timestamp - timestamp_offset) as usize / 1000 * WHISPER_SAMPLE_RATE as usize;
+        let offset = (last_2_seg.end_timestamp - timestamp_offset) as usize / 1000
+            * WHISPER_SAMPLE_RATE as usize;
         self.stable_offset = offset;
         self.drop_stable_by_segments(init);
         Ok(init.into())
@@ -257,9 +283,10 @@ impl Detector {
 
     fn drop_stable_by_segments(&mut self, stable_segments: &[Segment]) {
         let Some(last) = stable_segments.last() else {
-            return
+            return;
         };
-        let drop_offset: usize = (last.end_timestamp as usize / 1000 * WHISPER_SAMPLE_RATE as usize - self.offset) as usize;
+        let drop_offset: usize = (last.end_timestamp as usize / 1000 * WHISPER_SAMPLE_RATE as usize
+            - self.offset) as usize;
         let len_to_drain = self.pcm_f32.drain(0..drop_offset).len();
         self.offset += len_to_drain;
 
@@ -267,7 +294,10 @@ impl Detector {
             self.prompt_tokens.extend(&segment.tokens);
         }
         if self.prompt_tokens.len() > self.config.max_prompt_tokens {
-            let _ = self.prompt_tokens.drain(0..(self.prompt_tokens.len() - self.config.max_prompt_tokens)).len();
+            let _ = self
+                .prompt_tokens
+                .drain(0..(self.prompt_tokens.len() - self.config.max_prompt_tokens))
+                .len();
         }
     }
 }