diff --git a/Cargo.lock b/Cargo.lock index f00a64eba..28928c469 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,6 +163,15 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -208,9 +217,9 @@ dependencies = [ [[package]] name = "ash" -version = "0.34.0+1.2.203" +version = "0.37.0+1.3.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df" +checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6" dependencies = [ "libloading", ] @@ -994,9 +1003,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "d3d12" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" +checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" dependencies = [ "bitflags", "libloading", @@ -1133,7 +1142,7 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.54.0" +version = "0.61.0" dependencies = [ "async-trait", "deno_core", @@ -1143,14 +1152,14 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.60.0" +version = "0.67.0" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.142.0" +version = "0.149.0" dependencies = [ "anyhow", "deno_ops", @@ -1171,7 +1180,7 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.74.0" +version = "0.81.0" dependencies = [ "aes 0.8.1", "aes-gcm 0.10.0-pre", @@ -1203,7 +1212,7 @@ dependencies = [ [[package]] name = "deno_fetch" -version = "0.83.0" +version = "0.90.0" dependencies = [ "bytes", "data-url", @@ -1220,7 +1229,7 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.47.0" +version = "0.54.0" dependencies = [ "deno_core", "dlopen", @@ -1230,6 +1239,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "deno_flash" +version = "0.3.0" +dependencies = [ + "deno_core", + "deno_tls", + "deno_websocket", + "http", + "httparse", + "libc", + "log", + "mio", + "rustls", + "rustls-pemfile 0.2.1", + "serde", + "tokio", +] + [[package]] name = "deno_graph" version = "0.26.0" @@ -1253,7 +1280,7 @@ dependencies = [ [[package]] name = "deno_http" -version = "0.54.0" +version = "0.61.0" dependencies = [ "async-compression", "base64 0.13.0", @@ -1276,7 +1303,7 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.52.0" +version = "0.59.0" dependencies = [ "deno_core", "deno_tls", @@ -1288,9 +1315,19 @@ dependencies = [ "trust-dns-resolver", ] +[[package]] +name = "deno_node" +version = "0.4.0" +dependencies = [ + "deno_core", + "path-clean", + "regex", + "serde", +] + [[package]] name = "deno_ops" -version = "0.20.0" +version = "0.27.0" dependencies = [ "once_cell", "proc-macro-crate", @@ -1302,7 +1339,7 @@ dependencies = [ [[package]] name = "deno_runtime" -version = "0.68.0" +version = "0.75.0" dependencies = [ "atty", "deno_broadcast_channel", @@ -1311,8 +1348,10 @@ dependencies = [ "deno_crypto", "deno_fetch", "deno_ffi", + "deno_flash", "deno_http", "deno_net", + "deno_node", "deno_tls", "deno_url", "deno_web", @@ -1331,7 +1370,7 @@ dependencies = [ "log", "lzzzz", "netif", - "nix 0.23.0", + "nix 0.24.2", "notify", "once_cell", "regex", @@ -1348,13 +1387,13 @@ dependencies = [ [[package]] name = "deno_tls" -version = "0.47.0" +version = "0.54.0" dependencies = [ "deno_core", "once_cell", "rustls", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 1.0.0", "serde", "webpki", "webpki-roots", @@ -1362,7 +1401,7 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.60.0" +version = "0.67.0" dependencies = [ "deno_core", "serde", @@ -1372,7 +1411,7 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.91.0" +version = "0.98.0" dependencies = [ "async-trait", "base64-simd", @@ -1386,7 +1425,7 @@ dependencies = [ [[package]] name = "deno_webgpu" -version = "0.61.0" +version = "0.68.0" dependencies = [ "deno_core", "serde", @@ -1397,14 +1436,14 @@ dependencies = [ [[package]] name = "deno_webidl" -version = "0.60.0" +version = "0.67.0" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.65.0" +version = "0.72.0" dependencies = [ "deno_core", "deno_tls", @@ -1418,7 +1457,7 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.55.0" +version = "0.62.0" dependencies = [ "deno_core", "deno_web", @@ -2267,15 +2306,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashlink" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -dependencies = [ - "hashbrown 0.11.2", -] - [[package]] name = "hashlink" version = "0.8.0" @@ -2377,9 +2407,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -2649,6 +2679,7 @@ checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", "libloading", + "pkg-config", ] [[package]] @@ -2809,9 +2840,9 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "9f0455f2c1bc9a7caa792907026e469c1d91761fb0ea37cbb16427c77280cf35" dependencies = [ "cc", "pkg-config", @@ -2962,9 +2993,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ "bitflags", "block", @@ -3025,9 +3056,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705" +checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0" dependencies = [ "bit-set", "bitflags", @@ -3039,7 +3070,9 @@ dependencies = [ "rustc-hash", "serde", "spirv", + "termcolor", "thiserror", + "unicode-xid 0.2.3", ] [[package]] @@ -3091,12 +3124,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cc", "cfg-if 1.0.0", "libc", "memoffset", @@ -3396,6 +3428,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +[[package]] +name = "path-clean" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" + [[package]] name = "pem-rfc7468" version = "0.6.0" @@ -3979,13 +4017,14 @@ dependencies = [ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.0", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", "tokio-rustls", + "tokio-socks", "tokio-util 0.7.3", "tower-service", "url 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4089,16 +4128,15 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" dependencies = [ "bitflags", "fallible-iterator", "fallible-streaming-iterator", - "hashlink 0.7.0", + "hashlink", "libsqlite3-sys", - "memchr", "smallvec", ] @@ -4151,11 +4189,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.0", "schannel", "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.0", +] + [[package]] name = "rustls-pemfile" version = "1.0.0" @@ -4391,11 +4438,12 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.53.0" +version = "0.60.0" dependencies = [ "bytes", "derive_more", "serde", + "serde_bytes", "smallvec", "v8", ] @@ -4682,8 +4730,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788841def501aabde58d3666fcea11351ec3962e6ea75dbcd05c84a71d68bcd1" +source = "git+https://github.com/chiselstrike/sqlx.git?rev=bcfb6ca404f9070d9a2e187c717fd4bd166fc19f#bcfb6ca404f9070d9a2e187c717fd4bd166fc19f" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4692,8 +4739,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e" +source = "git+https://github.com/chiselstrike/sqlx.git?rev=bcfb6ca404f9070d9a2e187c717fd4bd166fc19f#bcfb6ca404f9070d9a2e187c717fd4bd166fc19f" dependencies = [ "ahash", "atoi", @@ -4713,7 +4759,7 @@ dependencies = [ "futures-executor", "futures-intrusive", "futures-util", - "hashlink 0.8.0", + "hashlink", "hex", "hkdf", "hmac", @@ -4729,7 +4775,7 @@ dependencies = [ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.8.5", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.0", "serde", "serde_json", "sha-1 0.10.0", @@ -4748,8 +4794,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adfd2df3557bddd3b91377fc7893e8fa899e9b4061737cbade4e1bb85f1b45c" +source = "git+https://github.com/chiselstrike/sqlx.git?rev=bcfb6ca404f9070d9a2e187c717fd4bd166fc19f#bcfb6ca404f9070d9a2e187c717fd4bd166fc19f" dependencies = [ "dotenvy", "either", @@ -4767,8 +4812,7 @@ dependencies = [ [[package]] name = "sqlx-rt" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3" +source = "git+https://github.com/chiselstrike/sqlx.git?rev=bcfb6ca404f9070d9a2e187c717fd4bd166fc19f#bcfb6ca404f9070d9a2e187c717fd4bd166fc19f" dependencies = [ "once_cell", "tokio", @@ -5612,6 +5656,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.9" @@ -6136,9 +6192,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.44.3" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f92c29dd66c7342443280695afc5bb79d773c3aa3eb02978cf24f058ae2b3d" +checksum = "5a1cbad73336d67babcbe5e3b03c907c8d2ff77fc6f997570af219bbd9fdb6ce" dependencies = [ "bitflags", "fslock", @@ -6338,11 +6394,12 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.12.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d" +checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2" dependencies = [ "arrayvec 0.7.2", + "bit-vec", "bitflags", "cfg_aliases", "codespan-reporting", @@ -6350,22 +6407,24 @@ dependencies = [ "fxhash", "log", "naga", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "profiling", "ron", "serde", "smallvec", "thiserror", + "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.12.5" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2" +checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646" dependencies = [ + "android_system_properties", "arrayvec 0.7.2", "ash", "bit-set", @@ -6386,7 +6445,7 @@ dependencies = [ "metal", "naga", "objc", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle", @@ -6400,9 +6459,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.12.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2" +checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604" dependencies = [ "bitflags", "bitflags_serde_shim", diff --git a/server/Cargo.toml b/server/Cargo.toml index d299c400e..a5d2c58c2 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -46,7 +46,7 @@ serde_derive = "1.0.137" serde_json = "1.0.81" sha2 = "0.10.2" socket2 = { version = "0.3.18", features = ["unix", "reuseport"] } -sqlx = { version = "0.6.1", features = [ +sqlx = { git = "https://github.com/chiselstrike/sqlx.git", rev = "bcfb6ca404f9070d9a2e187c717fd4bd166fc19f", features = [ "any", "postgres", "sqlite",