From a72c3b956f0f30c8e874c31969076a598c0aa19c Mon Sep 17 00:00:00 2001 From: Benjamin Pollack Date: Tue, 30 Jun 2026 21:15:49 +0000 Subject: [PATCH 1/2] bump to Rust 2024 --- Cargo.toml | 3 ++- src/session.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f18b069c..d469fcc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [package] -edition = "2021" +edition = "2024" +rust-version = "1.85" name = "ngrok-javascript" version = "1.7.0" diff --git a/src/session.rs b/src/session.rs index a573b138..fcf19c2a 100644 --- a/src/session.rs +++ b/src/session.rs @@ -318,7 +318,7 @@ impl SessionBuilder { .clone() .lock() .await - .call_async(args) + .call_async::<()>(args) .await .map_err(|_e| ConnectError::Canceled)?; } From b724f06d41cee7c41c084e8f239eeabe325e46e3 Mon Sep 17 00:00:00 2001 From: Benjamin Pollack Date: Thu, 2 Jul 2026 18:43:41 +0000 Subject: [PATCH 2/2] bump the rest of the deps, plus ngrok --- Cargo.lock | 83 +++++++++++++++++++++++++++++++++++++++++++++--------- Cargo.toml | 4 +-- flake.lock | 12 ++++---- 3 files changed, 77 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b6fec4c8..2f4b15da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,6 +238,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chacha20" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", +] + [[package]] name = "clang-sys" version = "1.8.1" @@ -302,6 +313,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -536,10 +556,22 @@ checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.2.0", "wasi 0.14.2+wasi-0.2.4", ] +[[package]] +name = "getrandom" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "rand_core 0.10.1", +] + [[package]] name = "gimli" version = "0.31.1" @@ -1013,9 +1045,9 @@ dependencies = [ [[package]] name = "muxado" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe5ca6bbdcad071d41711c03946be52da5fb46bb42024e5d0d74e2fcefeab71" +checksum = "8ac23a4a060b60ba42de5e988886790ba6aeb86e0ae0c879c637f5bbf0b78299" dependencies = [ "async-trait", "awaitdrop", @@ -1023,8 +1055,8 @@ dependencies = [ "bytes", "futures", "pin-project", - "rand", - "thiserror 1.0.69", + "rand 0.8.5", + "thiserror 2.0.17", "tokio", "tokio-util", "tracing", @@ -1090,9 +1122,9 @@ dependencies = [ [[package]] name = "ngrok" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ad94d0fd5a5e1f5bb6a99f06b8babc62594799785451f4aeb048c9b2848ef8" +checksum = "10f6c455d972d973dded17538cb01426ca79eccb9774ae8ab8f1af637f469f3f" dependencies = [ "arc-swap", "async-trait", @@ -1316,6 +1348,12 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.8.5" @@ -1324,7 +1362,18 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +dependencies = [ + "chacha20", + "getrandom 0.4.3", + "rand_core 0.10.1", ] [[package]] @@ -1334,7 +1383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -1346,6 +1395,12 @@ dependencies = [ "getrandom 0.2.16", ] +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + [[package]] name = "redox_syscall" version = "0.5.11" @@ -1635,7 +1690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest", ] @@ -1849,12 +1904,12 @@ dependencies = [ [[package]] name = "tokio-retry" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +checksum = "4a129d95275ebf4c493ec53bf0f8cd95f5ac161bc4f381700809a54f595d4470" dependencies = [ - "pin-project", - "rand", + "pin-project-lite", + "rand 0.10.1", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index d469fcc3..502754bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] edition = "2024" -rust-version = "1.85" +rust-version = "1.88" name = "ngrok-javascript" version = "1.7.0" @@ -18,7 +18,7 @@ mio = { version = "=0.8.6" } # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix napi = { version = "2.12.1", default-features = false, features = ["napi4", "tokio_rt"] } napi-derive = "2.12.1" -ngrok = {version = "0.18.0", features = ["hyper", "axum"]} +ngrok = { version = "0.19.0", features = ["hyper", "axum"] } parking_lot = "0.12.1" regex = "1.9.5" rustls = "0.23.25" diff --git a/flake.lock b/flake.lock index 1a29c7b5..2e4c3379 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1741588215, - "narHash": "sha256-XTZ051fwGcDPtCUSb7gJv5BsUPYcvjH9mFjVZboMIKQ=", + "lastModified": 1782813643, + "narHash": "sha256-+Y7z6oWSTJSKIhxPw7YKHOcIgoX/1PWgpRMZMj4AHlw=", "owner": "nix-community", "repo": "fenix", - "rev": "49b0989891f48cbfe6fc288ea76c3efa84000ed5", + "rev": "df161b9bd5f8ff444b2c213cd45410b7da6da602", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1741517882, - "narHash": "sha256-MmYdZyVwKa3YHzqoHdHw9/jZXkDE/5M3M+7363t4Pkc=", + "lastModified": 1782776471, + "narHash": "sha256-/dDPf8xr1qlkNyo7L7E3rAPRoabyF0t5ymVOEf+5bks=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5e7dd31c80d5821113ed9c9aa1616a73a63b49a1", + "rev": "c2a5273d39654d67b9ba952d64278ed40d35433d", "type": "github" }, "original": {