Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2025-04-19 15:25:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'feature/optimize-wasm-size'

Browse Source 
# Conflicts:
#   dev-setup/setup_linux.sh
#   dev-setup/setup_macos.sh
This commit is contained in:
Brandon Vandegrift 2025-04-08 01:13:13 +00:00
commit f1aee3ff05
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEVELOPMENT.md
View File

@ -8,8 +8,10 @@ This guide covers setting up environments for core, Flutter/Dart, and Python dev
## Obtaining the source code
1. Start by [forking] the project
1. Clone your fork
```shell
git clone https://gitlab.com/veilid/veilid.git
git clone https://gitlab.com/[USERNAME]/veilid.git
```
## Dependencies
@ -266,3 +268,5 @@ For each language, perform the listed steps and commit changed files.
### WASM
1. Update sources in `veilid-wasm/src`
[forking]:https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html

2
dev-setup/setup_linux.sh
View File

@ -111,7 +111,7 @@ fi
rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android wasm32-unknown-unknown
# install cargo packages
cargo install wasm-bindgen-cli wasm-pack wasm-opt cargo-edit
cargo install wasm-bindgen-cli wasm-pack wasm-opt cargo-edit@0.13.0
# install pip packages
pip3 install --upgrade bumpversion

2
dev-setup/setup_macos.sh
View File

@ -146,7 +146,7 @@ $BREW_COMMAND install capnp cmake llvm jq
rustup target add aarch64-apple-darwin aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
# install cargo packages
cargo install wasm-bindgen-cli wasm-pack wasm-opt cargo-edit
cargo install wasm-bindgen-cli wasm-pack wasm-opt cargo-edit@0.13.0
# attempt to install pip packages - this may result in an error, which we will try to catch
pip3 install --upgrade bumpversion || ( \

2
veilid-wasm/src/lib.rs
View File

@ -628,7 +628,7 @@ pub fn routing_context_watch_dht_values(
let res = routing_context
.watch_dht_values(key, subkeys, expiration, count)
.await?;
APIResult::Ok(res.to_string())
APIResult::Ok(res.as_u64().to_string())
})
}

2
veilid-wasm/src/veilid_routing_context_js.rs
View File

@ -379,7 +379,7 @@ impl VeilidRoutingContext {
let res = routing_context
.watch_dht_values(key, subkeys, expiration, count)
.await?;
APIResult::Ok(res.to_string())
APIResult::Ok(res.as_u64().to_string())
}
/// Cancels a watch early