From 1dcd790ac46153c675d423c6cc73c64b83c870cd Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Fri, 6 Jun 2025 12:58:54 -0700 Subject: [PATCH 1/4] bump wit-bindgen to 0.42.1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 88c31954..6404ad81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ tracing-appender = "0.2" tracing-error = "0.2" tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "std"] } walkdir = "2.4" -wit-bindgen = "0.36.0" +wit-bindgen = "0.42.1" zip = "0.6" [workspace] From 7ec84b7f17ff636761dc9190dc003e274ced6990 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Fri, 6 Jun 2025 15:25:01 -0700 Subject: [PATCH 2/4] build: use 33.0.0 wit file --- src/build/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/mod.rs b/src/build/mod.rs index 9e2382e3..7f269831 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -40,7 +40,7 @@ const PACKAGE_JSON_NAME: &str = "package.json"; const COMPONENTIZE_MJS_NAME: &str = "componentize.mjs"; const HYPERWARE_WIT_1_0_0_URL: &str = "https://raw.githubusercontent.com/hyperware-ai/hyperware-wit/v1.0.0/hyperware.wit"; -const WASI_VERSION: &str = "27.0.0"; // TODO: un-hardcode +const WASI_VERSION: &str = "33.0.0"; // TODO: un-hardcode const DEFAULT_WORLD_1_0_0: &str = "process-v1"; const KINODE_PROCESS_LIB_CRATE_NAME: &str = "hyperware_process_lib"; From dfa30a6d79739aa4d6d966f41851369049f4bf97 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 23 Jun 2025 15:50:50 -0700 Subject: [PATCH 3/4] bump to 2.0.0 --- Cargo.lock | 180 +++++++++++++++++++++++++++++++++++++++++++++++------ Cargo.toml | 2 +- 2 files changed, 161 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b5d746f..90f1ff56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -2105,7 +2105,7 @@ dependencies = [ "serde_json", "thiserror 1.0.63", "url", - "wit-bindgen", + "wit-bindgen 0.36.0", ] [[package]] @@ -2281,7 +2281,7 @@ dependencies = [ [[package]] name = "kit" -version = "1.0.2" +version = "2.0.0" dependencies = [ "alloy", "alloy-sol-macro", @@ -2316,7 +2316,7 @@ dependencies = [ "tracing-error", "tracing-subscriber", "walkdir", - "wit-bindgen", + "wit-bindgen 0.42.1", "zip", ] @@ -2332,6 +2332,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" version = "0.2.158" @@ -4470,7 +4476,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" dependencies = [ "leb128", - "wasmparser", + "wasmparser 0.220.0", +] + +[[package]] +name = "wasm-encoder" +version = "0.230.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4349d0943718e6e434b51b9639e876293093dca4b96384fb136ab5bd5ce6660" +dependencies = [ + "leb128fmt", + "wasmparser 0.230.0", ] [[package]] @@ -4485,8 +4501,20 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.220.0", + "wasmparser 0.220.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.230.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a52e010df5494f4289ccc68ce0c2a8c17555225a5e55cc41b98f5ea28d0844b" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder 0.230.0", + "wasmparser 0.230.0", ] [[package]] @@ -4502,6 +4530,18 @@ dependencies = [ "semver 1.0.23", ] +[[package]] +name = "wasmparser" +version = "0.230.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808198a69b5a0535583370a51d459baa14261dfab04800c4864ee9e1a14346ed" +dependencies = [ + "bitflags 2.6.0", + "hashbrown 0.15.2", + "indexmap", + "semver 1.0.23", +] + [[package]] name = "wasmtimer" version = "0.4.1" @@ -4777,8 +4817,18 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a2b3e15cd6068f233926e7d8c7c588b2ec4fb7cc7bf3824115e7c7e2a8485a3" dependencies = [ - "wit-bindgen-rt", - "wit-bindgen-rust-macro", + "wit-bindgen-rt 0.36.0", + "wit-bindgen-rust-macro 0.36.0", +] + +[[package]] +name = "wit-bindgen" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa5b79cd8cb4b27a9be3619090c03cbb87fe7b1c6de254b4c9b4477188828af8" +dependencies = [ + "wit-bindgen-rt 0.42.1", + "wit-bindgen-rust-macro 0.42.1", ] [[package]] @@ -4789,7 +4839,18 @@ checksum = "b632a5a0fa2409489bd49c9e6d99fcc61bb3d4ce9d1907d44662e75a28c71172" dependencies = [ "anyhow", "heck", - "wit-parser", + "wit-parser 0.220.0", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35e550f614e16db196e051d22b0d4c94dd6f52c90cb1016240f71b9db332631" +dependencies = [ + "anyhow", + "heck", + "wit-parser 0.230.0", ] [[package]] @@ -4801,6 +4862,17 @@ dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051105bab12bc78e161f8dfb3596e772dd6a01ebf9c4840988e00347e744966a" +dependencies = [ + "bitflags 2.6.0", + "futures", + "once_cell", +] + [[package]] name = "wit-bindgen-rust" version = "0.36.0" @@ -4812,9 +4884,25 @@ dependencies = [ "indexmap", "prettyplease", "syn 2.0.90", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", + "wasm-metadata 0.220.0", + "wit-bindgen-core 0.36.0", + "wit-component 0.220.0", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb1e0a91fc85f4ef70e0b81cd86c2b49539d3cd14766fd82396184aadf8cb7d7" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "prettyplease", + "syn 2.0.90", + "wasm-metadata 0.230.0", + "wit-bindgen-core 0.42.1", + "wit-component 0.230.0", ] [[package]] @@ -4828,8 +4916,23 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "wit-bindgen-core", - "wit-bindgen-rust", + "wit-bindgen-core 0.36.0", + "wit-bindgen-rust 0.36.0", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce69f52c5737705881d5da5a1dd06f47f8098d094a8d65a3e44292942edb571f" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.90", + "wit-bindgen-core 0.42.1", + "wit-bindgen-rust 0.42.1", ] [[package]] @@ -4845,10 +4948,29 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", + "wasm-encoder 0.220.0", + "wasm-metadata 0.220.0", + "wasmparser 0.220.0", + "wit-parser 0.220.0", +] + +[[package]] +name = "wit-component" +version = "0.230.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b607b15ead6d0e87f5d1613b4f18c04d4e80ceeada5ffa608d8360e6909881df" +dependencies = [ + "anyhow", + "bitflags 2.6.0", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder 0.230.0", + "wasm-metadata 0.230.0", + "wasmparser 0.230.0", + "wit-parser 0.230.0", ] [[package]] @@ -4866,7 +4988,25 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.220.0", +] + +[[package]] +name = "wit-parser" +version = "0.230.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "679fde5556495f98079a8e6b9ef8c887f731addaffa3d48194075c1dd5cd611b" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver 1.0.23", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.230.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6404ad81..5a4759f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kit" authors = ["Sybil Technologies AG"] -version = "1.0.2" +version = "2.0.0" edition = "2021" description = "Development toolkit for Hyperware" homepage = "https://hyperware.ai" From fe61cf09d5487c046cf4551c7c1c063302cf533d Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 23 Jun 2025 16:00:35 -0700 Subject: [PATCH 4/4] update process_lib dep --- Cargo.lock | 193 ++++++----------------------------------------------- Cargo.toml | 2 +- 2 files changed, 22 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90f1ff56..bd83640a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2086,15 +2086,16 @@ dependencies = [ [[package]] name = "hyperware_process_lib" -version = "1.0.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572247e1810eccc6197799ea4d9944751a62251d2fb6afa17ca88e16b30c22b9" +checksum = "6be2438db0ae3a32f56bad480822df88fb01e201138d36ffd9faa8244e16f143" dependencies = [ "alloy", "alloy-primitives", "alloy-sol-macro", "alloy-sol-types", "anyhow", + "base64 0.22.1", "bincode", "http", "mime_guess", @@ -2105,7 +2106,7 @@ dependencies = [ "serde_json", "thiserror 1.0.63", "url", - "wit-bindgen 0.36.0", + "wit-bindgen", ] [[package]] @@ -2316,7 +2317,7 @@ dependencies = [ "tracing-error", "tracing-subscriber", "walkdir", - "wit-bindgen 0.42.1", + "wit-bindgen", "zip", ] @@ -2326,12 +2327,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - [[package]] name = "leb128fmt" version = "0.1.0" @@ -3671,15 +3666,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spdx" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc" -dependencies = [ - "smallvec", -] - [[package]] name = "spin" version = "0.9.8" @@ -4469,16 +4455,6 @@ version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" -[[package]] -name = "wasm-encoder" -version = "0.220.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" -dependencies = [ - "leb128", - "wasmparser 0.220.0", -] - [[package]] name = "wasm-encoder" version = "0.230.0" @@ -4486,23 +4462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4349d0943718e6e434b51b9639e876293093dca4b96384fb136ab5bd5ce6660" dependencies = [ "leb128fmt", - "wasmparser 0.230.0", -] - -[[package]] -name = "wasm-metadata" -version = "0.220.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3e5f5920c5abfc45573c89b07b38efdaae1515ef86f83dad12d60e50ecd62b" -dependencies = [ - "anyhow", - "indexmap", - "serde", - "serde_derive", - "serde_json", - "spdx", - "wasm-encoder 0.220.0", - "wasmparser 0.220.0", + "wasmparser", ] [[package]] @@ -4513,21 +4473,8 @@ checksum = "1a52e010df5494f4289ccc68ce0c2a8c17555225a5e55cc41b98f5ea28d0844b" dependencies = [ "anyhow", "indexmap", - "wasm-encoder 0.230.0", - "wasmparser 0.230.0", -] - -[[package]] -name = "wasmparser" -version = "0.220.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" -dependencies = [ - "ahash", - "bitflags 2.6.0", - "hashbrown 0.14.5", - "indexmap", - "semver 1.0.23", + "wasm-encoder", + "wasmparser", ] [[package]] @@ -4811,35 +4758,14 @@ dependencies = [ "memchr", ] -[[package]] -name = "wit-bindgen" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2b3e15cd6068f233926e7d8c7c588b2ec4fb7cc7bf3824115e7c7e2a8485a3" -dependencies = [ - "wit-bindgen-rt 0.36.0", - "wit-bindgen-rust-macro 0.36.0", -] - [[package]] name = "wit-bindgen" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa5b79cd8cb4b27a9be3619090c03cbb87fe7b1c6de254b4c9b4477188828af8" dependencies = [ - "wit-bindgen-rt 0.42.1", - "wit-bindgen-rust-macro 0.42.1", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b632a5a0fa2409489bd49c9e6d99fcc61bb3d4ce9d1907d44662e75a28c71172" -dependencies = [ - "anyhow", - "heck", - "wit-parser 0.220.0", + "wit-bindgen-rt", + "wit-bindgen-rust-macro", ] [[package]] @@ -4850,16 +4776,7 @@ checksum = "e35e550f614e16db196e051d22b0d4c94dd6f52c90cb1016240f71b9db332631" dependencies = [ "anyhow", "heck", - "wit-parser 0.230.0", -] - -[[package]] -name = "wit-bindgen-rt" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7947d0131c7c9da3f01dfde0ab8bd4c4cf3c5bd49b6dba0ae640f1fa752572ea" -dependencies = [ - "bitflags 2.6.0", + "wit-parser", ] [[package]] @@ -4873,22 +4790,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "wit-bindgen-rust" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4329de4186ee30e2ef30a0533f9b3c123c019a237a7c82d692807bf1b3ee2697" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn 2.0.90", - "wasm-metadata 0.220.0", - "wit-bindgen-core 0.36.0", - "wit-component 0.220.0", -] - [[package]] name = "wit-bindgen-rust" version = "0.42.1" @@ -4900,24 +4801,9 @@ dependencies = [ "indexmap", "prettyplease", "syn 2.0.90", - "wasm-metadata 0.230.0", - "wit-bindgen-core 0.42.1", - "wit-component 0.230.0", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177fb7ee1484d113b4792cc480b1ba57664bbc951b42a4beebe573502135b1fc" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.90", - "wit-bindgen-core 0.36.0", - "wit-bindgen-rust 0.36.0", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", ] [[package]] @@ -4931,27 +4817,8 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "wit-bindgen-core 0.42.1", - "wit-bindgen-rust 0.42.1", -] - -[[package]] -name = "wit-component" -version = "0.220.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ccedf54cc65f287da268d64d2bf4f7530d2cfb2296ffbe3ad5f65567e4cf53" -dependencies = [ - "anyhow", - "bitflags 2.6.0", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder 0.220.0", - "wasm-metadata 0.220.0", - "wasmparser 0.220.0", - "wit-parser 0.220.0", + "wit-bindgen-core", + "wit-bindgen-rust", ] [[package]] @@ -4967,28 +4834,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.230.0", - "wasm-metadata 0.230.0", - "wasmparser 0.230.0", - "wit-parser 0.230.0", -] - -[[package]] -name = "wit-parser" -version = "0.220.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7117ce3adc0b4354b46dc1cf3190b00b333e65243d244c613ffcc58bdec84d" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver 1.0.23", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.220.0", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", ] [[package]] @@ -5006,7 +4855,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.230.0", + "wasmparser", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5a4759f1..462ef056 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ color-eyre = { version = "0.6", features = ["capture-spantrace"] } dirs = "5.0" fs-err = "2.11" hex = "0.4" -hyperware_process_lib = "1.0.4" +hyperware_process_lib = "2.0.0" nix = { version = "0.27", features = ["process", "signal", "term"] } proc-macro2 = "1.0" regex = "1"