diff --git a/Cargo.lock b/Cargo.lock index b99df352..087cd7ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,6 +29,12 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "base64" version = "0.22.1" @@ -56,6 +62,22 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "bytes" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" + +[[package]] +name = "cc" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9" +dependencies = [ + "find-msvc-tools", + "shlex", +] + [[package]] name = "cfg-if" version = "1.0.4" @@ -68,6 +90,23 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" + +[[package]] +name = "chacha20" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" +dependencies = [ + "cfg-if", + "cpufeatures", + "rand_core", +] + [[package]] name = "clipboard-win" version = "5.4.1" @@ -77,6 +116,15 @@ dependencies = [ "error-code", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "cranelift-assembler-x64" version = "0.129.1" @@ -243,6 +291,17 @@ version = "0.129.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d953932541249c91e3fa70a75ff1e52adc62979a2a8132145d4b9b3e6d1a9b6a" +[[package]] +name = "displaydoc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.3", +] + [[package]] name = "endian-type" version = "0.1.2" @@ -282,6 +341,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + [[package]] name = "fnv" version = "1.0.7" @@ -294,6 +359,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + [[package]] name = "futures-channel" version = "0.3.32" @@ -305,9 +379,81 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" + +[[package]] +name = "futures-io" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" + +[[package]] +name = "futures-macro" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "futures-sink" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" + +[[package]] +name = "futures-task" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" + +[[package]] +name = "futures-util" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "rand_core", + "wasm-bindgen", +] [[package]] name = "gimli" @@ -351,6 +497,207 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "http" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22053281f852e11534f5198498373cbb59295120a20771d90f7ed1897490a72" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "icu_collections" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" + +[[package]] +name = "icu_properties" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" + +[[package]] +name = "icu_provider" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "indexmap" version = "2.13.0" @@ -361,12 +708,29 @@ dependencies = [ "hashbrown 0.16.1", ] +[[package]] +name = "ipnet" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a756c3fac73139e83f14c2d742155dd2b78d3ee56597b419a0579b7bdd6dd78" + [[package]] name = "itoa" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "js-sys" +version = "0.3.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" +dependencies = [ + "cfg-if", + "futures-util", + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -391,12 +755,24 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +[[package]] +name = "litemap" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" + [[package]] name = "log" version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "mach2" version = "0.4.3" @@ -412,6 +788,17 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +[[package]] +name = "mio" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", +] + [[package]] name = "nibble_vec" version = "0.1.0" @@ -429,10 +816,16 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.11.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] +[[package]] +name = "once_cell" +version = "1.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + [[package]] name = "paste" version = "1.0.15" @@ -446,7 +839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9676d58588b220f7af69d7aa86108042d2acaf21dd24c641a6d9ef3c4e193ba" dependencies = [ "pd-host-function 0.22.2", - "syn", + "syn 2.0.117", ] [[package]] @@ -455,7 +848,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -466,7 +859,7 @@ checksum = "d9c941589fbbb839a40f7b80595d7b8f3742a8811268d787218f0c45c274d1f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -480,18 +873,21 @@ dependencies = [ "cranelift-module", "cranelift-native", "futures-channel", + "futures-util", "libc", "paste", "pd-edge-abi", "pd-host-function 0.1.0", "regex", + "reqwest", "rt-format", "rustyline", "self_cell", "serde", "serde_json", - "syn", + "syn 2.0.117", "tokio", + "url", "windows-sys 0.59.0", ] @@ -512,12 +908,27 @@ dependencies = [ "serde_json", ] +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + [[package]] name = "pin-project-lite" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + [[package]] name = "proc-macro2" version = "1.0.106" @@ -527,6 +938,62 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "quinn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8" +dependencies = [ + "bytes", + "cfg_aliases 0.2.2", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560" +dependencies = [ + "bytes", + "getrandom 0.4.3", + "lru-slab", + "rand", + "rand_pcg", + "ring", + "rustc-hash", + "rustls", + "rustls-pki-types", + "slab", + "thiserror", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694" +dependencies = [ + "cfg_aliases 0.2.2", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.61.2", +] + [[package]] name = "quote" version = "1.0.44" @@ -536,6 +1003,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "radix_trie" version = "0.2.1" @@ -546,6 +1019,32 @@ dependencies = [ "nibble_vec", ] +[[package]] +name = "rand" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" +dependencies = [ + "chacha20", + "getrandom 0.4.3", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + +[[package]] +name = "rand_pcg" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +dependencies = [ + "rand_core", +] + [[package]] name = "regalloc2" version = "0.13.5" @@ -602,15 +1101,70 @@ dependencies = [ ] [[package]] -name = "rt-format" -version = "0.3.1" +name = "reqwest" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45087cee619d316fa4bd1675494acff4a5eaa0892fa53bc364bd246f13e452e2" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "lazy_static", - "regex", -] - + "base64", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rt-format" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45087cee619d316fa4bd1675494acff4a5eaa0892fa53bc364bd246f13e452e2" +dependencies = [ + "lazy_static", + "regex", +] + [[package]] name = "rustc-hash" version = "2.1.1" @@ -630,6 +1184,41 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "rustls" +version = "0.23.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustscript" version = "0.1.0" @@ -637,6 +1226,12 @@ dependencies = [ "pd-vm", ] +[[package]] +name = "rustversion" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" + [[package]] name = "rustyline" version = "14.0.0" @@ -659,6 +1254,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ryu" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + [[package]] name = "self_cell" version = "1.2.2" @@ -692,7 +1293,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -708,18 +1309,58 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + [[package]] name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +[[package]] +name = "socket2" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "syn" version = "2.0.117" @@ -731,20 +1372,101 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "target-lexicon" version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" +[[package]] +name = "thiserror" +version = "2.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.3", +] + +[[package]] +name = "tinystr" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ + "bytes", + "libc", + "mio", "pin-project-lite", + "socket2", "tokio-macros", + "windows-sys 0.61.2", ] [[package]] @@ -755,9 +1477,102 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" +dependencies = [ + "bitflags 2.11.0", + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", + "url", ] +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "unicode-ident" version = "1.0.24" @@ -776,12 +1591,119 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.117", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmtime-internal-core" version = "42.0.1" @@ -803,6 +1725,35 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "web-sys" +version = "0.3.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "windows-link" version = "0.2.1" @@ -900,6 +1851,95 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + +[[package]] +name = "yoke" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" + +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "zmij" version = "1.0.21" diff --git a/Cargo.toml b/Cargo.toml index 5cfc571d..098701b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ name = "vm" [features] default = ["runtime", "cli", "cranelift-jit"] runtime = [] +http-client = ["dep:reqwest", "dep:url", "dep:tokio", "dep:futures-util"] edge-abi = [ "dep:edge_abi", "edge_abi/console", @@ -60,6 +61,10 @@ cranelift-jit = { version = "0.129.1", optional = true } cranelift-module = { version = "0.129.1", optional = true } cranelift-native = { version = "0.129.1", optional = true } pd-host-function = { path = "./pd-host-function", version = "0.1.0" } +reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream"], optional = true } +url = { version = "2", optional = true } +futures-util = { version = "0.3", optional = true } +tokio = { version = "1", features = ["rt", "net", "time"], optional = true } edge_abi = { package = "pd-edge-abi", version = "0.1.1", default-features = false, optional = true } futures-channel = "0.3" paste = "1" @@ -85,5 +90,10 @@ name = "host_binding_generation_tests" path = "tests/host_binding_generation_tests.rs" required-features = ["cranelift-jit"] +[[test]] +name = "http_host_tests" +path = "tests/vm/http_host_tests.rs" +required-features = ["http-client"] + [build-dependencies] syn = { version = "2", features = ["full"] } diff --git a/build.rs b/build.rs index 09cfa5ac..6a7e1dc0 100644 --- a/build.rs +++ b/build.rs @@ -149,11 +149,18 @@ fn main() { println!("cargo:rerun-if-changed={}", catalog_path.display()); let catalog = parse_catalog(&catalog_path); - let host_sources = [SourceSpec { - path: "src/builtins/runtime/host.rs".to_string(), - module: "host".to_string(), - category: SourceCategory::DefaultHost, - }]; + let host_sources = [ + SourceSpec { + path: "src/builtins/runtime/host.rs".to_string(), + module: "host".to_string(), + category: SourceCategory::DefaultHost, + }, + SourceSpec { + path: "src/builtins/runtime/http.rs".to_string(), + module: "http".to_string(), + category: SourceCategory::DefaultHost, + }, + ]; let builtin_sources = builtin_source_specs(&namespaces); let core_sources = [SourceSpec { path: "src/builtins/runtime/core.rs".to_string(), diff --git a/pd-host-function/src/edge.rs b/pd-host-function/src/edge.rs new file mode 100644 index 00000000..4f6c268a --- /dev/null +++ b/pd-host-function/src/edge.rs @@ -0,0 +1,1162 @@ +use quote::{format_ident, quote}; +use syn::{ + Error, Expr, FnArg, Ident, ItemFn, LitStr, Meta, Pat, PatIdent, ReturnType, Token, Type, + punctuated::Punctuated, +}; + +pub(crate) fn expand_scoped_pd_host_function( + attr: Punctuated, + mut item: ItemFn, +) -> Result { + let edge_attr = parse_edge_host_attr(&attr)?; + let was_async = item.sig.asyncness.is_some(); + let docs = doc_string(&item.attrs); + if docs.trim().is_empty() { + return Err(Error::new_spanned( + &item.sig.ident, + "#[pd_host_function] requires /// doc comments", + )); + } + if edge_attr.scope.is_some() && !edge_attr.bind_params.is_empty() { + return Err(Error::new_spanned( + &item.sig.ident, + "scoped pd_host_function does not support bind(...); scoped registrations must be self-contained", + )); + } + + transform_async_edge_function(&mut item, &edge_attr)?; + validate_edge_bind_names(&item, &edge_attr.bind_params)?; + for input in &item.sig.inputs { + validate_edge_param(input, &edge_attr.bind_params)?; + } + validate_edge_return_type(&item.sig.output)?; + + let (wrapper_name, impl_name) = wrapper_and_impl_names(&item.sig.ident); + if item.sig.ident != impl_name { + item.sig.ident = impl_name.clone(); + } + let wrapper = generate_edge_host_binder(&item, &wrapper_name, &edge_attr)?; + let static_wrapper = + generate_scoped_edge_host_static_wrapper(&item, &wrapper_name, &edge_attr, was_async)?; + let registration = generate_edge_host_registration(&item, &wrapper_name, &edge_attr, &docs)?; + Ok(quote! { + #item + #wrapper + #static_wrapper + #registration + }) +} + +fn doc_string(attrs: &[syn::Attribute]) -> String { + attrs + .iter() + .filter_map(|attr| { + if !attr.path().is_ident("doc") { + return None; + } + match &attr.meta { + Meta::NameValue(name_value) => match &name_value.value { + syn::Expr::Lit(expr_lit) => match &expr_lit.lit { + syn::Lit::Str(value) => Some(value.value().trim().to_string()), + _ => None, + }, + _ => None, + }, + _ => None, + } + }) + .filter(|line| !line.is_empty()) + .collect::>() + .join("\n") +} + +struct EdgeHostAttr { + name: Expr, + scope: Option, + bind_params: Vec, +} + +#[derive(Clone, Copy)] +enum EdgeHostScopeAttr { + Runtime, + Http, + HttpExtension, + Io, + Transport, + Mqtt, + WebSocket, + WebRtc, + Proxy, + Console, +} + +fn parse_edge_host_attr(args: &Punctuated) -> Result { + let mut name = None; + let mut scope = None; + let mut bind_params = Vec::new(); + + for meta in args { + match meta { + Meta::NameValue(name_value) if name_value.path.is_ident("name") => { + if name.is_some() { + return Err(Error::new_spanned( + name_value, + "duplicate name argument in #[pd_host_function(...)]", + )); + } + name = Some(name_value.value.clone()); + } + Meta::NameValue(name_value) if name_value.path.is_ident("scope") => { + if scope.is_some() { + return Err(Error::new_spanned( + name_value, + "duplicate scope argument in #[pd_host_function(...)]", + )); + } + scope = Some(parse_edge_scope(&name_value.value)?); + } + Meta::List(list) if list.path.is_ident("bind") => { + let idents = + list.parse_args_with(Punctuated::::parse_terminated)?; + bind_params.extend(idents.into_iter()); + } + other => { + return Err(Error::new_spanned( + other, + "expected #[pd_host_function(name = ..., scope = ..., bind(...))]", + )); + } + } + } + + let Some(name) = name else { + return Err(Error::new( + proc_macro2::Span::call_site(), + "expected #[pd_host_function(name = ..., scope = ..., bind(...))]", + )); + }; + + Ok(EdgeHostAttr { + name, + scope, + bind_params, + }) +} + +fn parse_edge_scope(value: &Expr) -> Result { + let scope_name = match value { + Expr::Path(path) => { + let Some(segment) = path.path.segments.last() else { + return Err(Error::new_spanned( + value, + "scope must be one of runtime, http, http_extension, io, transport, mqtt, websocket, webrtc, proxy, or console", + )); + }; + if path.path.segments.len() != 1 { + return Err(Error::new_spanned( + value, + "scope must be one of runtime, http, http_extension, io, transport, mqtt, websocket, webrtc, proxy, or console", + )); + } + segment.ident.to_string() + } + Expr::Lit(expr_lit) => match &expr_lit.lit { + syn::Lit::Str(value) => value.value(), + _ => { + return Err(Error::new_spanned( + value, + "scope must be one of runtime, http, http_extension, io, transport, mqtt, websocket, webrtc, proxy, or console", + )); + } + }, + _ => { + return Err(Error::new_spanned( + value, + "scope must be one of runtime, http, http_extension, io, transport, mqtt, websocket, webrtc, proxy, or console", + )); + } + }; + + match scope_name.as_str() { + "runtime" => Ok(EdgeHostScopeAttr::Runtime), + "http" => Ok(EdgeHostScopeAttr::Http), + "http_extension" | "http_extensions" => Ok(EdgeHostScopeAttr::HttpExtension), + "io" | "io_override" | "io_overrides" => Ok(EdgeHostScopeAttr::Io), + "transport" => Ok(EdgeHostScopeAttr::Transport), + "mqtt" => Ok(EdgeHostScopeAttr::Mqtt), + "websocket" => Ok(EdgeHostScopeAttr::WebSocket), + "webrtc" => Ok(EdgeHostScopeAttr::WebRtc), + "proxy" => Ok(EdgeHostScopeAttr::Proxy), + "console" => Ok(EdgeHostScopeAttr::Console), + _ => Err(Error::new_spanned( + value, + "scope must be one of runtime, http, http_extension, io, transport, mqtt, websocket, webrtc, proxy, or console", + )), + } +} + +fn edge_scope_tokens(scope: EdgeHostScopeAttr) -> proc_macro2::TokenStream { + match scope { + EdgeHostScopeAttr::Runtime => { + quote!(crate::abi_impl::registry::EdgeHostScope::Runtime) + } + EdgeHostScopeAttr::Http => quote!(crate::abi_impl::registry::EdgeHostScope::Http), + EdgeHostScopeAttr::HttpExtension => { + quote!(crate::abi_impl::registry::EdgeHostScope::HttpExtension) + } + EdgeHostScopeAttr::Io => quote!(crate::abi_impl::registry::EdgeHostScope::Io), + EdgeHostScopeAttr::Transport => { + quote!(crate::abi_impl::registry::EdgeHostScope::Transport) + } + EdgeHostScopeAttr::Mqtt => quote!(crate::abi_impl::registry::EdgeHostScope::Mqtt), + EdgeHostScopeAttr::WebSocket => { + quote!(crate::abi_impl::registry::EdgeHostScope::WebSocket) + } + EdgeHostScopeAttr::WebRtc => { + quote!(crate::abi_impl::registry::EdgeHostScope::WebRtc) + } + EdgeHostScopeAttr::Proxy => { + quote!(crate::abi_impl::registry::EdgeHostScope::Proxy) + } + EdgeHostScopeAttr::Console => { + quote!(crate::abi_impl::registry::EdgeHostScope::Console) + } + } +} + +fn find_context_param_ident(item: &ItemFn) -> Option { + item.sig.inputs.iter().find_map(|input| { + let FnArg::Typed(pat_type) = input else { + return None; + }; + if !is_edge_context_type(&pat_type.ty) { + return None; + } + match pat_type.pat.as_ref() { + Pat::Ident(PatIdent { ident, .. }) => Some(ident.clone()), + _ => None, + } + }) +} + +fn async_scope_prepare_stmt( + item: &ItemFn, + attr: &EdgeHostAttr, +) -> Result { + let Some(scope) = attr.scope else { + return Ok(quote!()); + }; + let requires_prepare = matches!( + scope, + EdgeHostScopeAttr::Http | EdgeHostScopeAttr::HttpExtension + ); + if !requires_prepare { + return Ok(quote!()); + } + let Some(context_ident) = find_context_param_ident(item) else { + return Err(Error::new_spanned( + &item.sig.ident, + "async scoped http host functions must accept SharedProxyVmContext", + )); + }; + let scope_tokens = edge_scope_tokens(scope); + let name_expr = &attr.name; + Ok(quote! { + crate::abi_impl::prepare_scoped_host_call( + #context_ident.clone(), + #scope_tokens, + #name_expr, + ) + .await?; + }) +} + +fn transform_async_edge_function(item: &mut ItemFn, attr: &EdgeHostAttr) -> Result<(), Error> { + if item.sig.asyncness.is_none() { + return Ok(()); + } + + for input in &item.sig.inputs { + let FnArg::Typed(pat_type) = input else { + return Err(Error::new_spanned(input, "methods are not supported")); + }; + if is_value_slice_type(&pat_type.ty) { + return Err(Error::new_spanned( + &pat_type.ty, + "async edge host functions do not support raw args; use typed parameters instead", + )); + } + if edge_arg_decoder_kind(&pat_type.ty) + .ok() + .is_some_and(edge_arg_decoder_is_borrowed) + { + return Err(Error::new_spanned( + &pat_type.ty, + "async edge host functions do not support borrowed typed parameters; use owned String, Value, or VmMap inputs", + )); + } + } + + let Some(vm_ident) = find_vm_param_ident(item) else { + return Err(Error::new_spanned( + &item.sig.ident, + "async edge host functions must accept a Vm parameter so the macro can schedule the future", + )); + }; + + match edge_output_kind(&item.sig.output)? { + Some(EdgeOutputKind::ResultCallOutcome) => {} + Some(EdgeOutputKind::CallOutcome) => { + return Err(Error::new_spanned( + &item.sig.output, + "async edge host functions must return Result", + )); + } + None => { + return Err(Error::new_spanned( + &item.sig.output, + "edge host functions must return CallOutcome or Result", + )); + } + } + + let original_block = item.block.clone(); + let prepare_stmt = async_scope_prepare_stmt(item, attr)?; + item.sig.asyncness = None; + *item.block = syn::parse2(quote!({ + crate::abi_impl::schedule_current_future_call(#vm_ident, async move { + #prepare_stmt + let __pd_edge_outcome = (async move #original_block).await?; + match __pd_edge_outcome { + ::vm::CallOutcome::Return(values) => Ok(values), + ::vm::CallOutcome::Halt => Err(::vm::VmError::HostError( + "async edge host functions must not return Halt".to_string(), + )), + ::vm::CallOutcome::Yield => Err(::vm::VmError::HostError( + "async edge host functions must not return Yield".to_string(), + )), + ::vm::CallOutcome::Pending(_) => Err(::vm::VmError::HostError( + "async edge host functions must not return Pending".to_string(), + )), + } + }) + }))?; + Ok(()) +} + +fn validate_edge_bind_names(item: &ItemFn, bind_params: &[Ident]) -> Result<(), Error> { + let params = item + .sig + .inputs + .iter() + .filter_map(|input| match input { + FnArg::Typed(pat_type) => match pat_type.pat.as_ref() { + Pat::Ident(ident) => Some(ident.ident.to_string()), + _ => None, + }, + FnArg::Receiver(_) => None, + }) + .collect::>(); + + for bind in bind_params { + if !params.iter().any(|name| name == &bind.to_string()) { + return Err(Error::new_spanned( + bind, + format!( + "bind parameter '{}' does not match any function parameter", + bind + ), + )); + } + } + + Ok(()) +} + +fn validate_edge_param(arg: &FnArg, bind_params: &[Ident]) -> Result<(), Error> { + let FnArg::Typed(pat_type) = arg else { + return Err(Error::new_spanned(arg, "methods are not supported")); + }; + let Pat::Ident(PatIdent { ident, .. }) = pat_type.pat.as_ref() else { + return Err(Error::new_spanned( + &pat_type.pat, + "edge host parameters must use identifier patterns", + )); + }; + + if is_vm_context_type(&pat_type.ty) + || is_edge_async_ops_type(&pat_type.ty) + || is_edge_context_type(&pat_type.ty) + || is_value_slice_type(&pat_type.ty) + { + if bind_params.iter().any(|candidate| candidate == ident) { + return Err(Error::new_spanned( + ident, + "special edge host parameters must not be listed in bind(...)", + )); + } + return Ok(()); + } + + if bind_params.iter().any(|candidate| candidate == ident) { + return Ok(()); + } + + edge_arg_decoder_kind(&pat_type.ty).map(|_| ()) +} + +fn validate_edge_return_type(output: &ReturnType) -> Result<(), Error> { + match edge_output_kind(output)? { + Some(_) => Ok(()), + None => Err(Error::new_spanned( + output, + "edge host functions must return CallOutcome or Result", + )), + } +} + +fn generate_edge_host_binder( + item: &ItemFn, + wrapper_name: &syn::Ident, + attr: &EdgeHostAttr, +) -> Result { + let impl_name = &item.sig.ident; + let vis = &item.vis; + let name_expr = &attr.name; + let mut binder_params = Vec::::new(); + let mut binder_setup = Vec::::new(); + let mut closure_setup = Vec::::new(); + let mut call_args = Vec::::new(); + let mut extract_stmts = Vec::::new(); + let mut arg_index = 0usize; + let mut raw_args = false; + + binder_params.push(quote!(bind_vm: &mut ::vm::Vm)); + binder_params.push(quote!(bind_context: &crate::abi_impl::SharedProxyVmContext)); + binder_params.push(quote!(bind_async_ops: &crate::abi_impl::SharedVmAsyncOps)); + + for input in &item.sig.inputs { + let FnArg::Typed(pat_type) = input else { + return Err(Error::new_spanned(input, "methods are not supported")); + }; + let Pat::Ident(PatIdent { ident, .. }) = pat_type.pat.as_ref() else { + return Err(Error::new_spanned( + &pat_type.pat, + "edge host parameters must use identifier patterns", + )); + }; + let ty = &pat_type.ty; + + if is_vm_context_type(ty) { + call_args.push(quote!(vm)); + continue; + } + + if is_edge_async_ops_type(ty) { + binder_setup.push(quote!(let #ident = bind_async_ops.clone();)); + closure_setup.push(quote!(let #ident = #ident.clone();)); + call_args.push(quote!(#ident)); + continue; + } + + if is_edge_context_type(ty) { + binder_setup.push(quote!(let #ident = bind_context.clone();)); + closure_setup.push(quote!(let #ident = #ident.clone();)); + call_args.push(quote!(#ident)); + continue; + } + + if is_value_slice_type(ty) { + raw_args = true; + call_args.push(quote!(args)); + continue; + } + + if attr.bind_params.iter().any(|candidate| candidate == ident) { + binder_params.push(quote!(#ident: #ty)); + binder_setup.push(quote!(let #ident = #ident.clone();)); + closure_setup.push(quote!(let #ident = #ident.clone();)); + call_args.push(quote!(#ident)); + continue; + } + + let decoder = edge_arg_decoder_kind(ty)?; + extract_stmts.push(edge_extract_stmt(ident, decoder, arg_index, wrapper_name)); + call_args.push(quote!(#ident)); + arg_index += 1; + } + + let arity_check = if raw_args { + None + } else { + Some(quote! { + if args.len() != #arg_index { + return Err(::vm::VmError::HostError(format!( + "expected {} arguments, got {}", + #arg_index, + args.len() + ))); + } + }) + }; + + let call_expr = match edge_output_kind(&item.sig.output)? { + Some(EdgeOutputKind::ResultCallOutcome) => quote!(#impl_name(#(#call_args),*)), + Some(EdgeOutputKind::CallOutcome) => quote!(Ok(#impl_name(#(#call_args),*))), + None => { + return Err(Error::new_spanned( + &item.sig.output, + "edge host functions must return CallOutcome or Result", + )); + } + }; + + Ok(quote! { + #[allow(dead_code)] + #vis fn #wrapper_name(#(#binder_params),*) { + #(#binder_setup)* + crate::abi_impl::bind_async_host_handler(bind_vm, bind_async_ops, #name_expr, move |vm, args| { + #arity_check + #(#closure_setup)* + #(#extract_stmts)* + #call_expr + }); + } + }) +} + +fn generate_scoped_edge_host_static_wrapper( + item: &ItemFn, + wrapper_name: &syn::Ident, + attr: &EdgeHostAttr, + was_async: bool, +) -> Result { + let Some(scope) = attr.scope else { + return Ok(quote!()); + }; + let impl_name = &item.sig.ident; + let static_wrapper_name = format_ident!("__pd_edge_static_{}", wrapper_name); + let uses_vm = scoped_wrapper_uses_vm(item); + let scope_tokens = edge_scope_tokens(scope); + let scope_requires_prepare = matches!( + scope, + EdgeHostScopeAttr::Http | EdgeHostScopeAttr::HttpExtension + ); + let args_only_sync_fast_path = !uses_vm && !was_async; + let prepare_context_ident = format_ident!("__pd_edge_prepare_context"); + let mut setup_stmts = Vec::::new(); + let mut call_args = Vec::::new(); + let mut extract_stmts = Vec::::new(); + let mut arg_index = 0usize; + + for input in &item.sig.inputs { + let FnArg::Typed(pat_type) = input else { + return Err(Error::new_spanned(input, "methods are not supported")); + }; + let Pat::Ident(PatIdent { ident, .. }) = pat_type.pat.as_ref() else { + return Err(Error::new_spanned( + &pat_type.pat, + "edge host parameters must use identifier patterns", + )); + }; + let ty = &pat_type.ty; + + if is_vm_context_type(ty) { + call_args.push(quote!(vm)); + continue; + } + + if is_edge_async_ops_type(ty) { + setup_stmts.push(quote!(let #ident = crate::abi_impl::current_async_ops()?;)); + call_args.push(quote!(#ident)); + continue; + } + + if is_edge_context_type(ty) { + if args_only_sync_fast_path && scope_requires_prepare { + setup_stmts.push(quote!(let #ident = #prepare_context_ident.clone();)); + } else { + setup_stmts.push(quote!(let #ident = crate::abi_impl::current_vm_context()?;)); + } + call_args.push(quote!(#ident)); + continue; + } + + if is_value_slice_type(ty) { + return Err(Error::new_spanned( + ty, + "scoped pd_host_function does not support raw args", + )); + } + + if attr.bind_params.iter().any(|candidate| candidate == ident) { + return Err(Error::new_spanned( + ident, + "scoped pd_host_function does not support bind(...)", + )); + } + + let decoder = edge_arg_decoder_kind(ty)?; + extract_stmts.push(edge_extract_stmt(ident, decoder, arg_index, wrapper_name)); + call_args.push(quote!(#ident)); + arg_index += 1; + } + + let _ = u8::try_from(arg_index).map_err(|_| { + Error::new_spanned( + &item.sig.ident, + "edge host functions must have 255 arguments or fewer", + ) + })?; + let call_expr = match edge_output_kind(&item.sig.output)? { + Some(EdgeOutputKind::ResultCallOutcome) => quote!(#impl_name(#(#call_args),*)), + Some(EdgeOutputKind::CallOutcome) => quote!(Ok(#impl_name(#(#call_args),*))), + None => { + return Err(Error::new_spanned( + &item.sig.output, + "edge host functions must return CallOutcome or Result", + )); + } + }; + + if uses_vm { + Ok(quote! { + fn #static_wrapper_name( + vm: &mut ::vm::Vm, + args: &[::vm::Value], + ) -> Result<::vm::CallOutcome, ::vm::VmError> { + if args.len() != #arg_index { + return Err(::vm::VmError::HostError(format!( + "expected {} arguments, got {}", + #arg_index, + args.len() + ))); + } + #(#setup_stmts)* + let __pd_edge_outcome = { + #(#extract_stmts)* + #call_expr + }?; + Ok(__pd_edge_outcome) + } + }) + } else if args_only_sync_fast_path && scope_requires_prepare { + let name_expr = &attr.name; + Ok(quote! { + fn #static_wrapper_name( + args: &[::vm::Value], + ) -> Result<::vm::CallOutcome, ::vm::VmError> { + if args.len() != #arg_index { + return Err(::vm::VmError::HostError(format!( + "expected {} arguments, got {}", + #arg_index, + args.len() + ))); + } + let #prepare_context_ident = crate::abi_impl::current_vm_context()?; + if !crate::abi_impl::scoped_host_call_can_run_synchronously( + &#prepare_context_ident, + #scope_tokens, + #name_expr, + )? { + return Err(::vm::VmError::HostError(format!( + "synchronous scoped host function {} requires an async signature", + #name_expr, + ))); + } + #(#setup_stmts)* + #(#extract_stmts)* + let __pd_edge_outcome = #call_expr?; + Ok(__pd_edge_outcome) + } + }) + } else { + Ok(quote! { + fn #static_wrapper_name( + args: &[::vm::Value], + ) -> Result<::vm::CallOutcome, ::vm::VmError> { + if args.len() != #arg_index { + return Err(::vm::VmError::HostError(format!( + "expected {} arguments, got {}", + #arg_index, + args.len() + ))); + } + #(#setup_stmts)* + let __pd_edge_outcome = { + #(#extract_stmts)* + #call_expr + }?; + Ok(__pd_edge_outcome) + } + }) + } +} + +fn generate_edge_host_registration( + item: &ItemFn, + wrapper_name: &syn::Ident, + attr: &EdgeHostAttr, + docs: &str, +) -> Result { + let Some(scope) = attr.scope else { + return Ok(quote!()); + }; + + let entry_name = format_ident!("__pd_edge_registration_{}", wrapper_name); + let scope_tokens = edge_scope_tokens(scope); + let static_wrapper_name = format_ident!("__pd_edge_static_{}", wrapper_name); + let function_kind = if scoped_wrapper_uses_vm(item) { + quote!(crate::abi_impl::registry::EdgeHostRegistrationFunction::StackStatic(#static_wrapper_name)) + } else { + quote!(crate::abi_impl::registry::EdgeHostRegistrationFunction::ArgsStatic(#static_wrapper_name)) + }; + let mut arity = 0usize; + + for input in &item.sig.inputs { + let FnArg::Typed(pat_type) = input else { + return Err(Error::new_spanned(input, "methods are not supported")); + }; + if is_vm_context_type(&pat_type.ty) + || is_edge_async_ops_type(&pat_type.ty) + || is_edge_context_type(&pat_type.ty) + { + continue; + } + if is_value_slice_type(&pat_type.ty) { + return Err(Error::new_spanned( + &pat_type.ty, + "scoped pd_host_function does not support raw args", + )); + } + arity += 1; + } + + let arity = u8::try_from(arity).map_err(|_| { + Error::new_spanned( + &item.sig.ident, + "edge host functions must have 255 arguments or fewer", + ) + })?; + let name_expr = &attr.name; + let docs = docs.to_string(); + + Ok(quote! { + #[::linkme::distributed_slice(crate::abi_impl::registry::PD_EDGE_HOST_FUNCTIONS)] + #[allow(non_upper_case_globals)] + static #entry_name: crate::abi_impl::registry::EdgeHostRegistration = + crate::abi_impl::registry::EdgeHostRegistration { + scope: #scope_tokens, + name: #name_expr, + arity: #arity, + docs: #docs, + function: #function_kind, + }; + }) +} + +fn scoped_wrapper_uses_vm(item: &ItemFn) -> bool { + item.sig.inputs.iter().any(|input| match input { + FnArg::Typed(pat_type) => is_vm_context_type(&pat_type.ty), + FnArg::Receiver(_) => false, + }) +} + +fn find_vm_param_ident(item: &ItemFn) -> Option { + item.sig.inputs.iter().find_map(|input| { + let FnArg::Typed(pat_type) = input else { + return None; + }; + if !is_vm_context_type(&pat_type.ty) { + return None; + } + match pat_type.pat.as_ref() { + Pat::Ident(PatIdent { ident, .. }) => Some(ident.clone()), + _ => None, + } + }) +} + +fn wrapper_and_impl_names(name: &syn::Ident) -> (syn::Ident, syn::Ident) { + let original = name.to_string(); + match original.strip_suffix("_impl") { + Some(prefix) => ( + syn::Ident::new(prefix, name.span()), + syn::Ident::new(&original, name.span()), + ), + None => ( + syn::Ident::new(&original, name.span()), + syn::Ident::new(&format!("{original}_impl"), name.span()), + ), + } +} + +#[derive(Clone, Copy)] +enum EdgeArgDecoderKind { + String, + StringRef, + Int, + Bool, + Value, + ValueRef, + Map, + MapRef, +} + +#[derive(Clone, Copy)] +enum EdgeOutputKind { + CallOutcome, + ResultCallOutcome, +} + +fn edge_arg_decoder_kind(ty: &Type) -> Result { + match ty { + Type::Group(group) => edge_arg_decoder_kind(&group.elem), + Type::Paren(paren) => edge_arg_decoder_kind(&paren.elem), + Type::Reference(reference) => { + if reference.mutability.is_some() { + return Err(Error::new_spanned( + ty, + "mutable borrowed edge host argument types are not supported", + )); + } + let Some(inner) = type_path_terminal_ident(reference.elem.as_ref()) else { + return Err(Error::new_spanned( + ty, + "unsupported borrowed edge host argument type", + )); + }; + match inner.as_str() { + "str" => Ok(EdgeArgDecoderKind::StringRef), + "Value" => Ok(EdgeArgDecoderKind::ValueRef), + "VmMap" => Ok(EdgeArgDecoderKind::MapRef), + other => Err(Error::new_spanned( + ty, + format!("unsupported borrowed edge host argument type '&{other}'"), + )), + } + } + Type::Path(path) => { + let Some(segment) = path.path.segments.last() else { + return Err(Error::new_spanned( + ty, + "unsupported edge host argument type", + )); + }; + match segment.ident.to_string().as_str() { + "String" => Ok(EdgeArgDecoderKind::String), + "i8" | "i16" | "i32" | "i64" | "isize" | "u8" | "u16" | "u32" | "u64" | "usize" => { + Ok(EdgeArgDecoderKind::Int) + } + "bool" => Ok(EdgeArgDecoderKind::Bool), + "Value" => Ok(EdgeArgDecoderKind::Value), + "VmMap" => Ok(EdgeArgDecoderKind::Map), + other => Err(Error::new_spanned( + ty, + format!("unsupported edge host argument type '{other}'"), + )), + } + } + _ => Err(Error::new_spanned( + ty, + "unsupported edge host argument type", + )), + } +} + +fn edge_extract_stmt( + ident: &Ident, + decoder: EdgeArgDecoderKind, + arg_index: usize, + wrapper_name: &syn::Ident, +) -> proc_macro2::TokenStream { + let label = LitStr::new( + &format!("{} {}", wrapper_name, ident), + proc_macro2::Span::call_site(), + ); + let index = syn::Index::from(arg_index); + match decoder { + EdgeArgDecoderKind::String => quote! { + let #ident = match args.get(#index) { + Some(::vm::Value::String(value)) => value.to_string(), + Some(_) => return Err(::vm::VmError::TypeMismatch("string")), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::StringRef => quote! { + let #ident = match args.get(#index) { + Some(::vm::Value::String(value)) => value.as_str(), + Some(_) => return Err(::vm::VmError::TypeMismatch("string")), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::Int => quote! { + let #ident = match args.get(#index) { + Some(::vm::Value::Int(value)) => *value, + Some(_) => return Err(::vm::VmError::TypeMismatch("int")), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::Bool => quote! { + let #ident = match args.get(#index) { + Some(::vm::Value::Bool(value)) => *value, + Some(_) => return Err(::vm::VmError::TypeMismatch("bool")), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::Value => quote! { + let #ident = match args.get(#index) { + Some(value) => value.clone(), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::ValueRef => quote! { + let #ident = match args.get(#index) { + Some(value) => value, + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::Map => quote! { + let #ident = match args.get(#index) { + Some(::vm::Value::Map(entries)) => entries.as_ref().clone(), + Some(_) => return Err(::vm::VmError::TypeMismatch("map")), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + EdgeArgDecoderKind::MapRef => quote! { + let #ident = match args.get(#index) { + Some(::vm::Value::Map(entries)) => entries.as_ref(), + Some(_) => return Err(::vm::VmError::TypeMismatch("map")), + None => { + return Err(::vm::VmError::HostError(format!( + "missing argument: {}", + #label + ))); + } + }; + }, + } +} + +fn edge_arg_decoder_is_borrowed(decoder: EdgeArgDecoderKind) -> bool { + matches!( + decoder, + EdgeArgDecoderKind::StringRef | EdgeArgDecoderKind::ValueRef | EdgeArgDecoderKind::MapRef + ) +} + +fn type_path_terminal_ident(ty: &Type) -> Option { + match ty { + Type::Group(group) => type_path_terminal_ident(&group.elem), + Type::Paren(paren) => type_path_terminal_ident(&paren.elem), + Type::Path(path) => path + .path + .segments + .last() + .map(|segment| segment.ident.to_string()), + _ => None, + } +} + +fn edge_output_kind(output: &ReturnType) -> Result, Error> { + match output { + ReturnType::Default => Ok(None), + ReturnType::Type(_, ty) => { + if is_call_outcome_type(ty) { + return Ok(Some(EdgeOutputKind::CallOutcome)); + } + if is_host_call_result_type(ty) { + return Ok(Some(EdgeOutputKind::ResultCallOutcome)); + } + if let Some(inner) = unwrap_result_type(ty)? + && is_call_outcome_type(&inner) + { + return Ok(Some(EdgeOutputKind::ResultCallOutcome)); + } + Ok(None) + } + } +} + +fn unwrap_result_type(ty: &Type) -> Result, Error> { + match ty { + Type::Group(group) => unwrap_result_type(&group.elem), + Type::Paren(paren) => unwrap_result_type(&paren.elem), + Type::Reference(reference) => unwrap_result_type(&reference.elem), + Type::Path(path) => { + let Some(segment) = path.path.segments.last() else { + return Ok(None); + }; + if segment.ident != "Result" { + return Ok(None); + } + let syn::PathArguments::AngleBracketed(args) = &segment.arguments else { + return Err(Error::new_spanned( + &segment.arguments, + "Result requires generic arguments", + )); + }; + let Some(syn::GenericArgument::Type(inner)) = args.args.first() else { + return Err(Error::new_spanned( + args, + "Result requires a return type argument", + )); + }; + Ok(Some(inner.clone())) + } + _ => Ok(None), + } +} + +fn is_call_outcome_type(ty: &Type) -> bool { + match ty { + Type::Group(group) => is_call_outcome_type(&group.elem), + Type::Paren(paren) => is_call_outcome_type(&paren.elem), + Type::Reference(reference) => is_call_outcome_type(&reference.elem), + Type::Path(path) => path + .path + .segments + .last() + .is_some_and(|segment| segment.ident == "CallOutcome"), + _ => false, + } +} + +fn is_host_call_result_type(ty: &Type) -> bool { + match ty { + Type::Group(group) => is_host_call_result_type(&group.elem), + Type::Paren(paren) => is_host_call_result_type(&paren.elem), + Type::Reference(reference) => is_host_call_result_type(&reference.elem), + Type::Path(path) => path + .path + .segments + .last() + .is_some_and(|segment| segment.ident == "HostCallResult"), + _ => false, + } +} + +fn is_vm_context_type(ty: &Type) -> bool { + match ty { + Type::Group(group) => is_vm_context_type(&group.elem), + Type::Paren(paren) => is_vm_context_type(&paren.elem), + Type::Reference(reference) => is_vm_context_type(&reference.elem), + Type::Path(path) => path + .path + .segments + .last() + .is_some_and(|segment| segment.ident == "Vm"), + _ => false, + } +} + +fn is_edge_async_ops_type(ty: &Type) -> bool { + match ty { + Type::Group(group) => is_edge_async_ops_type(&group.elem), + Type::Paren(paren) => is_edge_async_ops_type(&paren.elem), + Type::Reference(reference) => is_edge_async_ops_type(&reference.elem), + Type::Path(path) => path + .path + .segments + .last() + .is_some_and(|segment| segment.ident == "SharedVmAsyncOps"), + _ => false, + } +} + +fn is_edge_context_type(ty: &Type) -> bool { + match ty { + Type::Group(group) => is_edge_context_type(&group.elem), + Type::Paren(paren) => is_edge_context_type(&paren.elem), + Type::Reference(reference) => is_edge_context_type(&reference.elem), + Type::Path(path) => path + .path + .segments + .last() + .is_some_and(|segment| segment.ident == "SharedProxyVmContext"), + _ => false, + } +} + +fn is_value_slice_type(ty: &Type) -> bool { + match ty { + Type::Group(group) => is_value_slice_type(&group.elem), + Type::Paren(paren) => is_value_slice_type(&paren.elem), + Type::Reference(reference) => matches!( + reference.elem.as_ref(), + Type::Slice(slice) + if matches!( + slice.elem.as_ref(), + Type::Path(path) + if path + .path + .segments + .last() + .is_some_and(|segment| segment.ident == "Value") + ) + ), + _ => false, + } +} + +#[cfg(test)] +mod tests { + use super::expand_scoped_pd_host_function; + use syn::{ItemFn, Meta, Token, parse_quote, punctuated::Punctuated}; + + #[test] + fn preserves_async_scoped_edge_host_expansion() { + let attr: Punctuated = parse_quote!(name = "test::suspend", scope = http); + let item: ItemFn = parse_quote! { + /// Returns a value after a scoped host operation completes. + #[pd_host_function(name = "test::suspend", scope = http)] + async fn suspend( + _vm: &mut Vm, + _context: SharedProxyVmContext, + ) -> Result { + Ok(CallOutcome::Return(vm::CallReturn::none())) + } + }; + + let expanded = expand_scoped_pd_host_function(attr, item) + .expect("async scoped edge host functions should be accepted"); + let rendered = expanded.to_string(); + assert!(rendered.contains("schedule_current_future_call")); + assert!(rendered.contains("PD_EDGE_HOST_FUNCTIONS")); + } +} diff --git a/pd-host-function/src/lib.rs b/pd-host-function/src/lib.rs index 4aa1d3bc..4a878844 100644 --- a/pd-host-function/src/lib.rs +++ b/pd-host-function/src/lib.rs @@ -5,15 +5,35 @@ use syn::{ punctuated::Punctuated, }; +mod edge; + #[proc_macro_attribute] pub fn pd_host_function(attr: TokenStream, item: TokenStream) -> TokenStream { let args = parse_macro_input!(attr with Punctuated::::parse_terminated); - match expand_pd_host_function(args, parse_macro_input!(item as ItemFn)) { + let item = parse_macro_input!(item as ItemFn); + let result = if uses_edge_host_contract(&args, &item) { + edge::expand_scoped_pd_host_function(args, item) + } else { + expand_pd_host_function(args, item) + }; + match result { Ok(tokens) => tokens.into(), Err(err) => err.to_compile_error().into(), } } +fn uses_edge_host_contract(args: &Punctuated, item: &ItemFn) -> bool { + if item.sig.asyncness.is_some() { + return true; + } + + args.iter().any(|meta| match meta { + Meta::NameValue(name_value) if name_value.path.is_ident("scope") => true, + Meta::List(list) if list.path.is_ident("bind") => true, + _ => false, + }) +} + fn expand_pd_host_function( attr: Punctuated, mut item: ItemFn, @@ -482,7 +502,7 @@ fn uses_taken_extractor(ty: &Type) -> bool { #[cfg(test)] mod tests { - use super::expand_pd_host_function; + use super::{expand_pd_host_function, uses_edge_host_contract}; use syn::{ItemFn, Meta, Token, parse_quote, punctuated::Punctuated}; #[test] @@ -533,4 +553,26 @@ mod tests { .expect_err("the pd-host-function macro must not accept an async attribute"); assert!(error.to_string().contains("only supports name")); } + + #[test] + fn native_async_signature_selects_edge_contract() { + let attr: Punctuated = parse_quote!(name = "test::async_call"); + let item: ItemFn = parse_quote! { + async fn async_call() -> VmResult> { + todo!() + } + }; + assert!(uses_edge_host_contract(&attr, &item)); + } + + #[test] + fn name_expression_alone_does_not_select_edge_contract() { + let attr: Punctuated = parse_quote!(name = NAME_PATH); + let item: ItemFn = parse_quote! { + fn sync_call() -> VmResult> { + todo!() + } + }; + assert!(!uses_edge_host_contract(&attr, &item)); + } } diff --git a/plans/2026-08-06_review-findings-host-http.md b/plans/2026-08-06_review-findings-host-http.md new file mode 100644 index 00000000..79f6b28c --- /dev/null +++ b/plans/2026-08-06_review-findings-host-http.md @@ -0,0 +1,51 @@ +# RustScript Host/HTTP Review Findings + +**Review baseline:** `origin/master` (`ddfe64025456dc87dce4c7c7f79311a0b1c47a5a`) → `0f28ee9930890daffae5aa3c0bb70daf9c123997`, plus the current working-tree changes in `pd-host-function`. + +**Review mode:** read-only review by `gpt-5.6-sol` with high reasoning. No tests or files were run/changed by the reviewer. The main agent owns the follow-up implementation. + +## Blocking findings and directions + +1. **SSRF DNS check is detached from the actual connection** + - `src/builtins/runtime/http.rs:359-464` (`validate_url`, `execute_request`). + - `ToSocketAddrs` validates one resolution, while Reqwest resolves again during `send()`. DNS rebinding and IPv4-mapped IPv6 can bypass the policy. + - Use one validated resolver result for the connection; repeat resolve/validate/pin for every redirect; normalize mapped IPv6 and special-use ranges. + +2. **HTTP cancellation leaves blocking request threads alive** + - `src/builtins/runtime/http.rs:102-154,449-504`. + - Cancellation removes the receiver but does not stop `send()`/`read_to_end()` work. + - Use cancellable async tasks or explicit abort handles, enforce per-VM/process concurrency limits, and confirm task termination before dropping records. + +3. **Host capability binding is fail-open** + - `src/vm/host.rs:139-158,1795-1835`; `build.rs:997-1052`. + - Default registry construction and lazy fallback prevent an embedding from declaring an explicit host capability set. + - Add an explicit empty registry/capability profile, a no-default-fallback mode, and import preflight before side effects. + +4. **Blocking DNS runs before the host call becomes pending** + - `src/builtins/runtime/http.rs:193-216`. + - Keep synchronous validation structural; move DNS, IP policy checks, and connect into the cancellable task. + +5. **Empty port allowlist is interpreted as unrestricted** + - `HttpConfig::default`, `validate_url`. + - Fail closed or add an explicit unrestricted-port option. + +6. **Timeout and response representation need explicit contracts** + - Use one absolute deadline across redirects/DNS/connect/body. + - Preserve duplicate and byte-valued response headers instead of silently dropping them. + +7. **`pd_host_function` edge integration is coupled to downstream private layout** + - `pd-host-function/src/lib.rs`, `pd-host-function/src/edge.rs`. + - The macro currently emits `crate::abi_impl`, `::vm`, and `::linkme` paths. Introduce a stable support facade or separate edge extension boundary. + +8. **Macro diagnostics and public API compatibility** + - Infer execution type from `ItemFn.sig.asyncness` and return signatures rather than attribute shape. + - Validate generic arity and reject unsupported native async forms with direct `syn::Error` diagnostics. + - Assess the public `CallableDef` field addition and provide a compatibility constructor/API. + +## Implementation order + +1. Define the host macro contract: async from signature, scope only registration metadata. +2. Fix HTTP DNS/cancellation/timeout/port policy. +3. Add explicit host capability binding and remove implicit fallback where requested. +4. Stabilize the proc-macro support boundary and compile-fail coverage. +5. Run focused tests, then workspace gates. diff --git a/src/builtins/runtime/http.rs b/src/builtins/runtime/http.rs new file mode 100644 index 00000000..fbef6b62 --- /dev/null +++ b/src/builtins/runtime/http.rs @@ -0,0 +1,618 @@ +use std::task::{Context, Poll}; + +#[cfg(feature = "http-client")] +use futures_util::StreamExt; +#[cfg(feature = "http-client")] +use futures_util::future::{AbortHandle, Abortable}; + +use pd_host_function::pd_host_function; + +use super::{HostCallResult, Vm, VmMap, VmResult}; +#[cfg(feature = "http-client")] +use crate::vm::Value; +use crate::vm::{CallReturn, HostOpId, VmError}; + +#[derive(Clone, Debug)] +pub struct HttpConfig { + pub allowed_schemes: Vec, + pub allowed_hosts: Vec, + pub allowed_ports: Vec, + pub max_redirects: usize, + pub max_request_body_bytes: usize, + pub max_response_body_bytes: usize, + pub connect_timeout: std::time::Duration, + pub request_timeout: std::time::Duration, + pub allow_private_ips: bool, +} + +impl Default for HttpConfig { + fn default() -> Self { + Self { + allowed_schemes: vec!["https".to_string()], + allowed_hosts: Vec::new(), + allowed_ports: Vec::new(), + max_redirects: 5, + max_request_body_bytes: 1024 * 1024, + max_response_body_bytes: 8 * 1024 * 1024, + connect_timeout: std::time::Duration::from_secs(10), + request_timeout: std::time::Duration::from_secs(30), + allow_private_ips: false, + } + } +} + +#[cfg(feature = "http-client")] +struct HttpCompletion { + result: VmResult, +} + +#[cfg(feature = "http-client")] +pub(crate) struct HttpState { + config: Option, + pending_ops: + std::collections::HashMap>, + abort_handles: std::collections::HashMap, +} + +#[cfg(not(feature = "http-client"))] +pub(crate) struct HttpState; + +impl Default for HttpState { + fn default() -> Self { + #[cfg(feature = "http-client")] + { + return Self { + config: None, + pending_ops: std::collections::HashMap::new(), + abort_handles: std::collections::HashMap::new(), + }; + } + + #[cfg(not(feature = "http-client"))] + Self + } +} + +impl HttpState { + pub(crate) fn configure(&mut self, config: HttpConfig) { + #[cfg(feature = "http-client")] + { + self.config = Some(config); + } + #[cfg(not(feature = "http-client"))] + let _ = config; + } + + pub(crate) fn clear_configuration(&mut self) { + #[cfg(feature = "http-client")] + { + self.cancel_all(); + self.config = None; + } + } + + pub(crate) fn is_configured(&self) -> bool { + #[cfg(feature = "http-client")] + { + return self.config.is_some(); + } + #[cfg(not(feature = "http-client"))] + false + } + + #[cfg(feature = "http-client")] + fn schedule( + &mut self, + op_id: HostOpId, + config: HttpConfig, + request: HttpRequest, + ) -> VmResult { + let (sender, receiver) = futures_channel::oneshot::channel(); + let (abort_handle, abort_registration) = AbortHandle::new_pair(); + let thread_name = format!("rustscript-http-{op_id}"); + std::thread::Builder::new() + .name(thread_name) + .spawn(move || { + let result = match tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + { + Ok(runtime) => runtime.block_on(async move { + match Abortable::new(execute_request(&config, &request), abort_registration) + .await + { + Ok(result) => result, + Err(_) => { + Err(VmError::HostError("HTTP request was cancelled".to_string())) + } + } + }), + Err(error) => Err(VmError::HostError(format!( + "failed to create HTTP runtime: {error}" + ))), + }; + let _ = sender.send(HttpCompletion { result }); + }) + .map_err(|error| { + VmError::HostError(format!("failed to start HTTP request: {error}")) + })?; + self.pending_ops.insert(op_id, receiver); + self.abort_handles.insert(op_id, abort_handle); + Ok(op_id) + } + + #[cfg(feature = "http-client")] + fn has_pending_op(&self, op_id: HostOpId) -> bool { + self.pending_ops.contains_key(&op_id) + } + + #[cfg(feature = "http-client")] + fn cancel_pending_op(&mut self, op_id: HostOpId) { + if let Some(handle) = self.abort_handles.remove(&op_id) { + handle.abort(); + } + self.pending_ops.remove(&op_id); + } + + #[cfg(feature = "http-client")] + fn cancel_all(&mut self) { + for handle in self.abort_handles.drain().map(|(_, handle)| handle) { + handle.abort(); + } + self.pending_ops.clear(); + } + + #[cfg(feature = "http-client")] + fn poll_pending_op( + &mut self, + op_id: HostOpId, + cx: &mut Context<'_>, + ) -> Poll> { + use std::pin::Pin; + + let poll_result = match self.pending_ops.get_mut(&op_id) { + Some(receiver) => Pin::new(receiver).poll(cx), + None => { + return Poll::Ready(Err(VmError::HostError(format!("unknown HTTP op {op_id}",)))); + } + }; + match poll_result { + Poll::Pending => Poll::Pending, + Poll::Ready(Ok(completion)) => { + self.pending_ops.remove(&op_id); + self.abort_handles.remove(&op_id); + Poll::Ready(completion.result) + } + Poll::Ready(Err(_)) => { + self.pending_ops.remove(&op_id); + self.abort_handles.remove(&op_id); + Poll::Ready(Err(VmError::HostError(format!( + "HTTP op {op_id} was cancelled", + )))) + } + } + } +} + +/// Starts an HTTP request under the VM's configured network policy. +/// +/// The request map accepts `method`, `url`, optional `headers`, and optional `body`. +/// The response map contains `status`, `headers`, `body`, and the final `url`. +#[pd_host_function(name = "http::client::request")] +pub(super) fn builtin_http_client_request( + vm: &mut Vm, + request: &VmMap, +) -> VmResult> { + #[cfg(not(feature = "http-client"))] + { + let _ = (vm, request); + return Err(VmError::HostError( + "HTTP client support is disabled; enable the http-client feature".to_string(), + )); + } + + #[cfg(feature = "http-client")] + { + let config = vm + .http_state + .config + .clone() + .ok_or_else(|| VmError::HostError("HTTP host is not configured".to_string()))?; + let request = parse_request(request, &config)?; + let op_id = vm.allocate_host_op_id(); + let op_id = vm.http_state.schedule(op_id, config, request)?; + Ok(HostCallResult::Pending(op_id)) + } +} + +#[cfg(feature = "http-client")] +pub(super) fn has_pending_op(vm: &Vm, op_id: HostOpId) -> bool { + vm.http_state.has_pending_op(op_id) +} + +#[cfg(not(feature = "http-client"))] +pub(super) fn has_pending_op(_vm: &Vm, _op_id: HostOpId) -> bool { + false +} + +pub(super) fn cancel_pending_op(vm: &mut Vm, op_id: HostOpId) { + #[cfg(feature = "http-client")] + vm.http_state.cancel_pending_op(op_id); + #[cfg(not(feature = "http-client"))] + let _ = (vm, op_id); +} + +pub(super) fn cancel_all_pending_ops(vm: &mut Vm) { + #[cfg(feature = "http-client")] + vm.http_state.cancel_all(); + #[cfg(not(feature = "http-client"))] + let _ = vm; +} + +pub(super) fn poll_pending_op( + vm: &mut Vm, + op_id: HostOpId, + cx: &mut Context<'_>, +) -> Poll> { + #[cfg(feature = "http-client")] + return vm.http_state.poll_pending_op(op_id, cx); + + #[cfg(not(feature = "http-client"))] + { + let _ = (vm, cx); + Poll::Ready(Err(VmError::HostError(format!( + "HTTP support is disabled for op {op_id}", + )))) + } +} + +#[cfg(feature = "http-client")] +struct HttpRequest { + method: reqwest::Method, + url: url::Url, + headers: Vec<(reqwest::header::HeaderName, reqwest::header::HeaderValue)>, + body: Option>, +} + +#[cfg(feature = "http-client")] +fn parse_request(map: &VmMap, config: &HttpConfig) -> VmResult { + let method = map_string(map, "method")?.to_ascii_uppercase(); + if !matches!( + method.as_str(), + "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS" + ) { + return Err(VmError::HostError(format!( + "HTTP method '{method}' is not allowed" + ))); + } + let method = reqwest::Method::from_bytes(method.as_bytes()) + .map_err(|_| VmError::HostError("invalid HTTP method".to_string()))?; + let url = map_string(map, "url")? + .parse::() + .map_err(|error| VmError::HostError(format!("invalid HTTP URL: {error}")))?; + if !url.username().is_empty() || url.password().is_some() { + return Err(VmError::HostError( + "HTTP URL userinfo is not allowed".to_string(), + )); + } + let body = match map.get(&Value::string("body")) { + None | Some(Value::Null) => None, + Some(Value::Bytes(bytes)) => { + if bytes.len() > config.max_request_body_bytes { + return Err(VmError::HostError( + "HTTP request body exceeds limit".to_string(), + )); + } + Some(bytes.as_ref().clone()) + } + Some(Value::String(text)) => { + if text.len() > config.max_request_body_bytes { + return Err(VmError::HostError( + "HTTP request body exceeds limit".to_string(), + )); + } + Some(text.as_bytes().to_vec()) + } + Some(_) => return Err(VmError::TypeMismatch("HTTP request body")), + }; + + let mut headers = Vec::new(); + if let Some(Value::Map(header_map)) = map.get(&Value::string("headers")) { + for (key, value) in header_map.iter() { + let Value::String(key) = key else { + return Err(VmError::TypeMismatch("HTTP header name")); + }; + let Value::String(value) = value else { + return Err(VmError::TypeMismatch("HTTP header value")); + }; + if matches!( + key.to_ascii_lowercase().as_str(), + "host" | "content-length" | "transfer-encoding" | "connection" + ) { + return Err(VmError::HostError(format!( + "HTTP header '{key}' is managed by the client", + ))); + } + let name = reqwest::header::HeaderName::from_bytes(key.as_bytes()) + .map_err(|_| VmError::HostError(format!("invalid HTTP header name '{key}'")))?; + let value = reqwest::header::HeaderValue::from_str(value).map_err(|_| { + VmError::HostError(format!("invalid HTTP header value for '{key}'")) + })?; + headers.push((name, value)); + } + } else if map.get(&Value::string("headers")).is_some() { + return Err(VmError::TypeMismatch("HTTP headers")); + } + + Ok(HttpRequest { + method, + url, + headers, + body, + }) +} + +#[cfg(feature = "http-client")] +fn map_string(map: &VmMap, key: &str) -> VmResult { + match map.get(&Value::string(key)) { + Some(Value::String(value)) => Ok(value.as_ref().clone()), + Some(_) => Err(VmError::TypeMismatch("HTTP request string field")), + None => Err(VmError::HostError(format!( + "missing HTTP request field '{key}'" + ))), + } +} + +#[cfg(feature = "http-client")] +fn validate_url(config: &HttpConfig, url: &url::Url) -> VmResult> { + let scheme = url.scheme().to_ascii_lowercase(); + if !config + .allowed_schemes + .iter() + .any(|allowed| allowed.eq_ignore_ascii_case(&scheme)) + { + return Err(VmError::HostError(format!( + "HTTP URL scheme '{scheme}' is not allowed", + ))); + } + let host = url + .host_str() + .ok_or_else(|| VmError::HostError("HTTP URL has no host".to_string()))?; + if !config + .allowed_hosts + .iter() + .any(|allowed| allowed.eq_ignore_ascii_case(host)) + { + return Err(VmError::HostError( + "HTTP target host is not allowed".to_string(), + )); + } + let port = url + .port_or_known_default() + .ok_or_else(|| VmError::HostError("HTTP URL has no known port".to_string()))?; + if !config.allowed_ports.contains(&port) { + return Err(VmError::HostError(format!( + "HTTP target port {port} is not allowed", + ))); + } + if config.allow_private_ips { + return Ok(None); + } + + if let Some(host_ip) = host.parse::().ok() { + if is_restricted_ip(host_ip) { + return Err(VmError::HostError( + "HTTP target resolves to a restricted IP".to_string(), + )); + } + return Ok(None); + } + + use std::net::ToSocketAddrs; + let addresses = (host, port) + .to_socket_addrs() + .map_err(|error| VmError::HostError(format!("HTTP host resolution failed: {error}")))? + .collect::>(); + if addresses.is_empty() + || addresses + .iter() + .any(|address| is_restricted_ip(address.ip())) + { + return Err(VmError::HostError( + "HTTP target resolves to a restricted IP".to_string(), + )); + } + Ok(addresses.first().copied()) +} + +#[cfg(feature = "http-client")] +fn is_restricted_ip(ip: std::net::IpAddr) -> bool { + match ip { + std::net::IpAddr::V4(ip) => { + ip.is_loopback() + || ip.is_private() + || ip.is_link_local() + || ip.is_unspecified() + || ip.is_broadcast() + || ip.is_multicast() + } + std::net::IpAddr::V6(ip) => { + if let Some(mapped) = ip.to_ipv4_mapped() { + return is_restricted_ip(std::net::IpAddr::V4(mapped)); + } + ip.is_loopback() + || ip.is_unique_local() + || ip.is_unicast_link_local() + || ip.is_unspecified() + || ip.is_multicast() + } + } +} + +#[cfg(feature = "http-client")] +async fn execute_request(config: &HttpConfig, request: &HttpRequest) -> VmResult { + let deadline = std::time::Instant::now() + config.request_timeout; + let mut method = request.method.clone(); + let mut url = request.url.clone(); + let mut body = request.body.clone(); + let mut headers = request.headers.clone(); + + for redirect_index in 0..=config.max_redirects { + let resolved_address = validate_url(config, &url)?; + let host = url + .host_str() + .ok_or_else(|| VmError::HostError("HTTP URL has no host".to_string()))?; + let mut client_builder = reqwest::Client::builder() + .redirect(reqwest::redirect::Policy::none()) + .no_proxy() + .connect_timeout(config.connect_timeout); + if let Some(address) = resolved_address { + client_builder = client_builder.resolve(host, address); + } + let client = client_builder + .build() + .map_err(|error| VmError::HostError(format!("HTTP client setup failed: {error}")))?; + let origin = request.url.origin(); + let mut builder = client.request(method.clone(), url.clone()); + for (name, value) in &headers { + builder = builder.header(name, value); + } + if let Some(body) = &body { + builder = builder.body(body.clone()); + } + let remaining = deadline.saturating_duration_since(std::time::Instant::now()); + if remaining.is_zero() { + return Err(VmError::HostError("HTTP request timed out".to_string())); + } + let response = tokio::time::timeout(remaining, builder.send()) + .await + .map_err(|_| VmError::HostError("HTTP request timed out".to_string()))? + .map_err(|error| VmError::HostError(format!("HTTP request failed: {error}")))?; + if response.status().is_redirection() { + if redirect_index == config.max_redirects { + return Err(VmError::HostError( + "HTTP redirect limit exceeded".to_string(), + )); + } + let location = response + .headers() + .get(reqwest::header::LOCATION) + .ok_or_else(|| VmError::HostError("HTTP redirect has no location".to_string()))? + .to_str() + .map_err(|_| VmError::HostError("HTTP redirect location is invalid".to_string()))? + .to_string(); + let next_url = url + .join(&location) + .map_err(|error| VmError::HostError(format!("invalid HTTP redirect: {error}")))?; + if next_url.origin() != origin { + headers.retain(|(name, _)| { + name != reqwest::header::AUTHORIZATION && name != reqwest::header::COOKIE + }); + } + if response.status() == reqwest::StatusCode::SEE_OTHER + || ((response.status() == reqwest::StatusCode::MOVED_PERMANENTLY + || response.status() == reqwest::StatusCode::FOUND) + && method != reqwest::Method::GET + && method != reqwest::Method::HEAD) + { + method = reqwest::Method::GET; + body = None; + } + url = next_url; + continue; + } + + let response_headers = response + .headers() + .iter() + .map(|(name, value)| { + let value = value + .to_str() + .map(Value::string) + .unwrap_or_else(|_| Value::bytes(value.as_bytes().to_vec())); + (Value::string(name.as_str()), value) + }) + .collect::>(); + let status = response.status(); + let mut bytes = Vec::new(); + let mut stream = response.bytes_stream(); + while let Some(chunk) = { + let remaining = deadline.saturating_duration_since(std::time::Instant::now()); + if remaining.is_zero() { + return Err(VmError::HostError( + "HTTP response read timed out".to_string(), + )); + } + tokio::time::timeout(remaining, stream.next()) + .await + .map_err(|_| VmError::HostError("HTTP response read timed out".to_string()))? + } { + let chunk = chunk.map_err(|error| { + VmError::HostError(format!("HTTP response read failed: {error}")) + })?; + if bytes.len().saturating_add(chunk.len()) > config.max_response_body_bytes { + return Err(VmError::HostError( + "HTTP response body exceeds limit".to_string(), + )); + } + bytes.extend_from_slice(&chunk); + } + let response_map = VmMap::from_entries(vec![ + ( + Value::string("status"), + Value::Int(i64::from(status.as_u16())), + ), + ( + Value::string("headers"), + Value::Map(std::sync::Arc::new(VmMap::from_entries(response_headers))), + ), + (Value::string("body"), Value::bytes(bytes)), + (Value::string("url"), Value::string(url.as_str())), + ]); + return Ok(CallReturn::one(Value::Map(std::sync::Arc::new( + response_map, + )))); + } + + Err(VmError::HostError( + "HTTP redirect processing failed".to_string(), + )) +} + +#[cfg(test)] +mod tests { + use super::HttpConfig; + #[cfg(feature = "http-client")] + use super::{is_restricted_ip, validate_url}; + + #[test] + fn default_http_policy_denies_all_hosts() { + let config = HttpConfig::default(); + assert_eq!(config.allowed_schemes, ["https"]); + assert!(config.allowed_hosts.is_empty()); + assert!(config.allowed_ports.is_empty()); + assert!(!config.allow_private_ips); + } + + #[cfg(feature = "http-client")] + #[test] + fn empty_port_allowlist_rejects_explicit_and_default_ports() { + let config = HttpConfig { + allowed_schemes: vec!["https".to_string()], + allowed_hosts: vec!["example.com".to_string()], + ..HttpConfig::default() + }; + let explicit = "https://example.com:443/".parse().expect("valid URL"); + let default_port = "https://example.com/".parse().expect("valid URL"); + assert!(validate_url(&config, &explicit).is_err()); + assert!(validate_url(&config, &default_port).is_err()); + } + + #[cfg(feature = "http-client")] + #[test] + fn ipv4_mapped_ipv6_loopback_is_restricted() { + assert!(is_restricted_ip( + "::ffff:127.0.0.1".parse().expect("valid IP") + )); + } +} diff --git a/src/builtins/runtime/io.rs b/src/builtins/runtime/io.rs index b9ef5340..51a83662 100644 --- a/src/builtins/runtime/io.rs +++ b/src/builtins/runtime/io.rs @@ -43,6 +43,10 @@ pub(super) fn cancel_pending_op(vm: &mut Vm, op_id: HostOpId) { vm.io_state.pending_ops.remove(&op_id); } +pub(super) fn has_pending_op(vm: &Vm, op_id: HostOpId) -> bool { + vm.io_state.pending_ops.contains_key(&op_id) +} + pub(super) fn poll_builtin_io_op( vm: &mut Vm, op_id: HostOpId, diff --git a/src/builtins/runtime/mod.rs b/src/builtins/runtime/mod.rs index 67fac4fc..b0361b06 100644 --- a/src/builtins/runtime/mod.rs +++ b/src/builtins/runtime/mod.rs @@ -9,6 +9,7 @@ mod aot; mod bytes; pub(crate) mod core; mod host; +mod http; #[cfg(not(target_arch = "wasm32"))] mod io; #[cfg(target_arch = "wasm32")] @@ -24,6 +25,8 @@ mod typed; #[cfg(target_arch = "wasm32")] use io_wasm as io; +pub use http::HttpConfig; +pub(crate) use http::HttpState; pub(crate) use io::IoState; pub use typed::HostCallResult; use typed::{ @@ -126,6 +129,7 @@ pub(crate) fn execute_builtin_call( pub(crate) fn cancel_builtin_io_op(vm: &mut Vm, op_id: HostOpId) { io::cancel_pending_op(vm, op_id); + http::cancel_pending_op(vm, op_id); } pub(crate) fn poll_builtin_io_op( @@ -133,11 +137,24 @@ pub(crate) fn poll_builtin_io_op( op_id: HostOpId, cx: &mut Context<'_>, ) -> Poll> { - io::poll_builtin_io_op(vm, op_id, cx) + if io::has_pending_op(vm, op_id) { + io::poll_builtin_io_op(vm, op_id, cx) + } else { + http::poll_pending_op(vm, op_id, cx) + } +} + +pub(crate) fn is_builtin_io_op(vm: &Vm, op_id: HostOpId) -> bool { + #[cfg(not(target_arch = "wasm32"))] + if io::has_pending_op(vm, op_id) { + return true; + } + http::has_pending_op(vm, op_id) } pub(crate) fn close_all_handles(vm: &mut Vm) { io::close_all_handles(vm); + http::cancel_all_pending_ops(vm); } #[cfg(test)] diff --git a/src/builtins/runtime/typed.rs b/src/builtins/runtime/typed.rs index 55612e0e..cf5d5f03 100644 --- a/src/builtins/runtime/typed.rs +++ b/src/builtins/runtime/typed.rs @@ -459,7 +459,7 @@ where { fn into_builtin_call_outcome(self) -> BuiltinCallOutcome { match self { - Self::Return(value) => value.into_builtin_call_outcome(), + Self::Return(value) => BuiltinCallOutcome::Return(return_one(value)), Self::Pending(op_id) => BuiltinCallOutcome::Pending(op_id), } } diff --git a/src/compiler/pipeline.rs b/src/compiler/pipeline.rs index 7f98363d..ff6e768a 100644 --- a/src/compiler/pipeline.rs +++ b/src/compiler/pipeline.rs @@ -579,7 +579,9 @@ fn schema_is_fully_known(schema: &TypeSchema) -> bool { | TypeSchema::GenericParam(_) => true, TypeSchema::Optional(inner) => schema_is_fully_known(inner), TypeSchema::Named(_, type_args) => type_args.iter().all(schema_is_fully_known), - TypeSchema::Array(item) | TypeSchema::Map(item) => schema_is_fully_known(item), + TypeSchema::Array(item) | TypeSchema::Map(item) => { + matches!(item.as_ref(), TypeSchema::Unknown) || schema_is_fully_known(item) + } TypeSchema::ArrayTuple(items) => items.iter().all(schema_is_fully_known), TypeSchema::ArrayTupleRest { prefix, rest } => { prefix.iter().all(schema_is_fully_known) && schema_is_fully_known(rest) diff --git a/src/lib.rs b/src/lib.rs index d28b0a5c..652e1957 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,6 +24,8 @@ pub use assembler::{AsmParseError, Assembler, AssemblerError, BytecodeBuilder, a #[cfg(feature = "runtime")] pub use builtins::runtime::HostCallResult; #[cfg(feature = "runtime")] +pub use builtins::runtime::HttpConfig; +#[cfg(feature = "runtime")] pub use builtins::runtime::print::{PrintHostFunction, PrintlnHostFunction, format_value}; pub use builtins::{ BUILTIN_CATALOG, BuiltinFunction, BuiltinNamespaceMemberSpec, BuiltinNamespaceSpec, @@ -35,7 +37,7 @@ pub use builtins::{ pub use bytecode::{ CallableEnvironment, CallableKind, CallablePrototype, CallableTarget, CallableValue, CaptureBindingMode, ExportedCallable, FunctionRegion, HostImport, OpCode, Program, - RootCallableBinding, ScriptFunction, TypeMap, Value, ValueType, + RootCallableBinding, ScriptFunction, TypeMap, Value, ValueType, VmMap, }; pub fn builtin_call_index(name: &str) -> Option { use builtins::BuiltinFunction; diff --git a/src/vm/host.rs b/src/vm/host.rs index ecca479a..cf8826a0 100644 --- a/src/vm/host.rs +++ b/src/vm/host.rs @@ -137,7 +137,7 @@ impl Default for HostFunctionRegistry { } impl HostFunctionRegistry { - fn empty() -> Self { + pub fn empty() -> Self { Self { entries: Arc::new(Vec::new()), by_name: Arc::new(HashMap::new()), @@ -456,6 +456,7 @@ impl HostFunctionRegistry { } } vm.install_resolved_calls(plan.resolved_calls.clone())?; + vm.set_default_host_fallback_enabled(false); Ok(()) } } @@ -851,6 +852,31 @@ impl Vm { self.runtime_print_sink = None; } + pub fn configure_http(&mut self, config: crate::builtins::runtime::HttpConfig) { + self.http_state.configure(config); + } + + pub fn clear_http_configuration(&mut self) { + self.http_state.clear_configuration(); + } + + pub fn http_is_configured(&self) -> bool { + self.http_state.is_configured() + } + + /// Enables or disables implicit binding of built-in host functions. + /// + /// Disabling this makes the VM use only explicitly registered host functions. The default + /// remains enabled for backwards compatibility until a registry is bound. + pub fn set_default_host_fallback_enabled(&mut self, enabled: bool) { + self.allow_default_host_fallback = enabled; + self.resolved_calls_dirty = true; + } + + pub fn default_host_fallback_enabled(&self) -> bool { + self.allow_default_host_fallback + } + pub(crate) fn write_runtime_print(&mut self, rendered: String) -> VmResult<()> { let Some(sink) = self.runtime_print_sink.as_mut() else { return Err(VmError::HostError( @@ -871,7 +897,7 @@ impl Vm { self.waiting_host_op.map(|op| op.op_id) } - pub(super) fn cancel_waiting_host_op(&mut self) { + pub fn cancel_waiting_host_op(&mut self) { let Some(waiting) = self.waiting_host_op.take() else { return; }; @@ -958,6 +984,35 @@ impl Vm { } } + pub fn wait_for_host_op_blocking_with_cancel(&mut self, mut should_cancel: F) -> VmResult<()> + where + F: FnMut() -> bool, + { + let waker = noop_waker(); + let mut cx = Context::from_waker(&waker); + loop { + if should_cancel() { + self.cancel_waiting_host_op(); + return Err(VmError::HostError("host operation cancelled".to_string())); + } + match self.poll_waiting_host_op(&mut cx) { + Poll::Ready(result) => return result, + Poll::Pending => { + #[cfg(not(target_arch = "wasm32"))] + { + std::thread::sleep(std::time::Duration::from_millis(1)); + } + #[cfg(target_arch = "wasm32")] + { + return Err(VmError::HostError( + "blocking host-op wait is unsupported on wasm32 runtime".to_string(), + )); + } + } + } + } + } + pub(super) fn execute_host_call( &mut self, index: u16, @@ -1520,7 +1575,7 @@ impl Vm { saved_stack.append(&mut host_stack); self.stack = saved_stack; let resume_ip = self.call_resume_ip(call_ip)?; - self.set_waiting_host_op(op_id, WaitingHostOpSource::HostBridge)?; + self.set_waiting_host_op(op_id, self.pending_host_op_source(op_id))?; self.ip = resume_ip; Ok(HostCallExecOutcome::Pending(op_id)) } @@ -1630,7 +1685,7 @@ impl Vm { CallOutcome::Pending(op_id) => { self.stack.truncate(arg_start); let resume_ip = self.call_resume_ip(call_ip)?; - self.set_waiting_host_op(op_id, WaitingHostOpSource::HostBridge)?; + self.set_waiting_host_op(op_id, self.pending_host_op_source(op_id))?; self.ip = resume_ip; Ok(HostCallExecOutcome::Pending(op_id)) } @@ -1688,7 +1743,7 @@ impl Vm { CallOutcome::Pending(op_id) => { self.stack.truncate(arg_start); let resume_ip = self.call_resume_ip(call_ip)?; - self.set_waiting_host_op(op_id, WaitingHostOpSource::HostBridge)?; + self.set_waiting_host_op(op_id, self.pending_host_op_source(op_id))?; self.ip = resume_ip; Ok(HostCallExecOutcome::Pending(op_id)) } @@ -1715,6 +1770,14 @@ impl Vm { Ok(resume_ip) } + fn pending_host_op_source(&self, op_id: HostOpId) -> WaitingHostOpSource { + if crate::builtins::runtime::is_builtin_io_op(self, op_id) { + WaitingHostOpSource::BuiltinIo + } else { + WaitingHostOpSource::HostBridge + } + } + pub(super) fn set_waiting_host_op( &mut self, op_id: HostOpId, @@ -1777,7 +1840,10 @@ impl Vm { return Ok(()); } - if self.host_function_symbols.is_empty() && self.host_functions.is_empty() { + if self.allow_default_host_fallback + && self.host_function_symbols.is_empty() + && self.host_functions.is_empty() + { let import_names = self .program .imports @@ -1803,7 +1869,9 @@ impl Vm { let bound = if let Some(bound) = self.host_function_symbols.get(&import.name).copied() { bound - } else if crate::builtins::runtime::bind_default_host_function(self, &import.name) { + } else if self.allow_default_host_fallback + && crate::builtins::runtime::bind_default_host_function(self, &import.name) + { self.host_function_symbols .get(&import.name) .copied() diff --git a/src/vm/mod.rs b/src/vm/mod.rs index ba148aec..295ff544 100644 --- a/src/vm/mod.rs +++ b/src/vm/mod.rs @@ -341,6 +341,7 @@ pub struct Vm { decoded_instruction_data: Arc, host_functions: Vec, host_function_symbols: HashMap, + allow_default_host_fallback: bool, builtin_overrides: HashMap, resolved_calls: Vec, resolved_calls_dirty: bool, @@ -384,6 +385,7 @@ pub struct Vm { waiting_host_op: Option, next_host_op_id: HostOpId, pub(crate) io_state: crate::builtins::runtime::IoState, + pub(crate) http_state: crate::builtins::runtime::HttpState, regex_cache: crate::builtins::runtime::regex::RegexCache, map_iterators: Vec>>, epoch_handle: EpochHandle, @@ -684,6 +686,7 @@ impl Vm { decoded_instruction_data, host_functions: Vec::new(), host_function_symbols: HashMap::new(), + allow_default_host_fallback: true, builtin_overrides: HashMap::new(), resolved_calls: Vec::new(), resolved_calls_dirty: true, @@ -727,6 +730,7 @@ impl Vm { waiting_host_op: None, next_host_op_id: 1, io_state: crate::builtins::runtime::IoState::default(), + http_state: crate::builtins::runtime::HttpState::default(), regex_cache: crate::builtins::runtime::regex::RegexCache::default(), map_iterators: Vec::new(), epoch_handle, diff --git a/tests/vm/http_host_tests.rs b/tests/vm/http_host_tests.rs new file mode 100644 index 00000000..43e070ac --- /dev/null +++ b/tests/vm/http_host_tests.rs @@ -0,0 +1,117 @@ +use std::io::{Read, Write}; +use std::net::TcpListener; +use std::thread; + +use vm::{HostFunctionRegistry, HttpConfig, Program, Value, Vm, VmStatus, compile_source}; + +fn build_request_program(url: String) -> Program { + compile_source(&format!( + r#" + use http; + http::client::request({{"method": "GET", "url": "{url}"}}); + "# + )) + .expect("HTTP request source should compile") + .program +} + +fn local_http_config(port: u16) -> HttpConfig { + HttpConfig { + allowed_schemes: vec!["http".to_string()], + allowed_hosts: vec!["127.0.0.1".to_string()], + allowed_ports: vec![port], + allow_private_ips: true, + ..HttpConfig::default() + } +} + +fn spawn_test_server() -> (u16, thread::JoinHandle<()>) { + let listener = TcpListener::bind(("127.0.0.1", 0)).expect("test listener should bind"); + let port = listener + .local_addr() + .expect("test listener should have an address") + .port(); + let handle = thread::spawn(move || { + let (mut stream, _) = listener.accept().expect("test request should arrive"); + let mut request = Vec::new(); + let mut buffer = [0_u8; 1024]; + loop { + let read = stream + .read(&mut buffer) + .expect("request should be readable"); + if read == 0 { + break; + } + request.extend_from_slice(&buffer[..read]); + if request.windows(4).any(|window| window == b"\r\n\r\n") { + break; + } + } + assert!(request.starts_with(b"GET / HTTP/1.1")); + stream + .write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 2\r\nX-Test: yes\r\n\r\nok") + .expect("response should be writable"); + }); + (port, handle) +} + +fn response_field<'a>(value: &'a Value, key: &str) -> &'a Value { + let Value::Map(map) = value else { + panic!("expected response map, got {value:?}"); + }; + map.get(&Value::string(key)) + .unwrap_or_else(|| panic!("response missing field {key}")) +} + +async fn drive_vm_to_halt(vm: &mut Vm) -> Result<(), vm::VmError> { + let mut status = vm.run()?; + loop { + match status { + VmStatus::Halted => return Ok(()), + VmStatus::Yielded => status = vm.resume()?, + VmStatus::Waiting(_) => { + vm.await_waiting_host_op().await?; + status = vm.resume()?; + } + } + } +} + +#[tokio::test(flavor = "current_thread")] +async fn http_host_executes_a_bounded_request_and_returns_a_response_map() { + let (port, server) = spawn_test_server(); + let mut vm = Vm::new(build_request_program(format!("http://127.0.0.1:{port}/"))); + vm.configure_http(local_http_config(port)); + HostFunctionRegistry::new() + .bind_vm_cached(&mut vm) + .expect("default host registry should bind HTTP"); + + drive_vm_to_halt(&mut vm) + .await + .expect("http request should complete"); + server.join().expect("test server should finish"); + + assert_eq!(response_field(&vm.stack()[0], "status"), &Value::Int(200)); + assert_eq!( + response_field(&vm.stack()[0], "body"), + &Value::bytes(b"ok".to_vec()) + ); +} + +#[test] +fn http_host_rejects_targets_until_an_explicit_policy_allows_them() { + let mut vm = Vm::new(build_request_program("http://127.0.0.1:1/".to_string())); + HostFunctionRegistry::new() + .bind_vm_cached(&mut vm) + .expect("default host registry should bind HTTP"); + let error = vm + .run() + .expect_err("unconfigured HTTP targets must be rejected"); + assert!( + error.to_string().contains("HTTP host is not configured") + || error + .to_string() + .contains("HTTP target host is not allowed"), + "unexpected error: {error}" + ); +}