methanium/mtp
Watch
3
0
Fork
You've already forked mtp
 0
Code Issues Pull requests 3 Projects Releases 22 Packages Wiki Activity Actions

(fix): some ci stuff
Some checks failed
CI / rustfmt (push) Successful in 3m5s
Details
CI / wasm build (push) Failing after 3m44s
Details
CI / clippy (push) Failing after 3m44s
Details
CI / test (push) Failing after 3m44s
Details
CI / web client (push) Has been cancelled
Details
CI / duplicate code (push) Has been cancelled
Details
CI / example (push) Has been cancelled
Details
CI / cargo-machete (push) Has been cancelled
Details
CI / cargo-deny (push) Has been cancelled
Details

Browse source
This commit is contained in:
Alois 2026-06-28 17:31:04 +02:00
commit 88f8f93d89
10 changed files with 83 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

149
.forgejo/workflows/ci.yml
View file

@ -8,6 +8,8 @@ on:
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
NIX_CONFIG: experimental-features = nix-command flakes
jobs: jobs:
fmt: fmt:
name: rustfmt name: rustfmt
@ -15,17 +17,15 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --component rustfmt apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Check formatting - name: Check formatting
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
cargo fmt --all --check nix develop --command cargo fmt --all --check
clippy: clippy:
name: clippy name: clippy
@ -33,18 +33,15 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --component clippy apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Run clippy - name: Run clippy
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
export MTP_TYPE_MAPS="$PWD/example/type-maps.yaml" nix develop --command mtp-clippy
cargo clippy --workspace --exclude mtp-wasm --all-targets --all-features -- -D warnings -W unreachable-pub
test: test:
name: test name: test
@ -52,18 +49,15 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Run tests - name: Run tests
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
export MTP_TYPE_MAPS="$PWD/example/type-maps.yaml" nix develop --command bash -lc 'cargo test --workspace --exclude mtp-wasm --all-features'
cargo test --workspace --exclude mtp-wasm --all-features
wasm: wasm:
name: wasm build name: wasm build
@ -71,18 +65,15 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev lld
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --target wasm32-unknown-unknown apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Build wasm crate - name: Build wasm crate
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
export MTP_TYPE_MAPS="$PWD/example/type-maps.yaml" nix develop --command bash -lc 'cargo build -p mtp-wasm --target wasm32-unknown-unknown'
cargo build -p mtp-wasm --target wasm32-unknown-unknown
env: env:
RUSTFLAGS: --cfg web_sys_unstable_apis RUSTFLAGS: --cfg web_sys_unstable_apis
@ -92,19 +83,16 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Check example usage workspace - name: Check example usage workspace
working-directory: example working-directory: example
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
export MTP_TYPE_MAPS="$PWD/type-maps.yaml" nix develop .. --command bash -lc 'export MTP_TYPE_MAPS="$PWD/type-maps.yaml"; cargo check --workspace --all-targets --all-features'
cargo check --workspace --all-targets --all-features
deny: deny:
name: cargo-deny name: cargo-deny
@ -112,22 +100,15 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Install cargo-deny
run: |
export PATH="$HOME/.cargo/bin:$PATH"
cargo install cargo-deny --locked
- name: Run cargo-deny - name: Run cargo-deny
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
cargo deny check nix develop --command cargo deny check advisories bans sources
machete: machete:
name: cargo-machete name: cargo-machete
@ -135,22 +116,15 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl build-essential pkg-config libssl-dev
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Install cargo-machete
run: |
export PATH="$HOME/.cargo/bin:$PATH"
cargo install cargo-machete --locked
- name: Run cargo-machete - name: Run cargo-machete
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
cargo machete nix develop --command mtp-machete
duplicates: duplicates:
name: duplicate code name: duplicate code
@ -158,22 +132,20 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl unzip nodejs
- name: Install pnpm
run: | run: |
curl -fsSL https://get.pnpm.io/install.sh | SHELL=/bin/sh sh - apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Install dependencies - name: Install dependencies
run: | run: |
export PATH="$HOME/.local/share/pnpm:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
pnpm install --frozen-lockfile nix develop --command pnpm install --frozen-lockfile
- name: Run duplicate detector - name: Run duplicate detector
run: | run: |
export PATH="$HOME/.local/share/pnpm:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
pnpm run dup nix develop --command pnpm run dup
web-client: web-client:
name: web client name: web client
@ -181,42 +153,31 @@ jobs:
steps: steps:
- uses: https://data.forgejo.org/actions/checkout@v4 - uses: https://data.forgejo.org/actions/checkout@v4
- name: Install system dependencies - name: Install Nix
run: apt-get update && apt-get install -y --no-install-recommends ca-certificates curl unzip nodejs build-essential pkg-config libssl-dev lld
- name: Install Rust
run: | run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --target wasm32-unknown-unknown apt-get update && apt-get install -y --no-install-recommends ca-certificates curl xz-utils
curl -L https://nixos.org/nix/install | sh -s -- --daemon
- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
- name: Build wasm package - name: Build wasm package
run: | run: |
export PATH="$HOME/.cargo/bin:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
export MTP_TYPE_MAPS="$PWD/example/type-maps.yaml" nix develop --command wasm-pack build wasm --target web
wasm-pack build wasm --target web
env: env:
RUSTFLAGS: --cfg web_sys_unstable_apis RUSTFLAGS: --cfg web_sys_unstable_apis
- name: Install pnpm
run: |
curl -fsSL https://get.pnpm.io/install.sh | SHELL=/bin/sh sh -
- name: Install dependencies - name: Install dependencies
run: | run: |
export PATH="$HOME/.local/share/pnpm:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
pnpm install --frozen-lockfile nix develop --command pnpm install --frozen-lockfile
- name: Build TypeScript package - name: Build TypeScript package
run: | run: |
export PATH="$HOME/.cargo/bin:$HOME/.local/share/pnpm:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
export MTP_TYPE_MAPS="$PWD/example/type-maps.yaml" nix develop --command pnpm run build
pnpm run build
env: env:
RUSTFLAGS: --cfg web_sys_unstable_apis RUSTFLAGS: --cfg web_sys_unstable_apis
- name: Build web client - name: Build web client
run: | run: |
export PATH="$HOME/.local/share/pnpm:$PATH" . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
pnpm --filter mtp-web-client run build nix develop --command pnpm --filter mtp-web-client run build

14
Cargo.toml
View file

@ -46,18 +46,18 @@ edition = "2024"
[dependencies] [dependencies]
# --- always-on core --- # --- always-on core ---
mtp-common = { path = "common" } mtp-common = { version = "0.1.0", path = "common" }
mtp-type-map = { path = "type-map" } mtp-type-map = { version = "0.1.0", path = "type-map" }
mtp-codec = { path = "codec" } mtp-codec = { version = "0.1.0", path = "codec" }
mtp-transport = { path = "transport" } mtp-transport = { version = "0.1.0", path = "transport" }
# --- optional, behind features --- # --- optional, behind features ---
mtp-crypto = { path = "crypto", optional = true, features = [ mtp-crypto = { version = "0.1.0", path = "crypto", optional = true, features = [
"serde", "serde",
"mlkem-tls", "mlkem-tls",
] } ] }
mtp-host = { path = "host", optional = true } mtp-host = { version = "0.1.0", path = "host", optional = true }
mtp-client = { path = "client", optional = true } mtp-client = { version = "0.1.0", path = "client", optional = true }
[features] [features]
default = [] default = []

8
client/Cargo.toml
View file

@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
mtp-common = { path = "../common" } mtp-common = { version = "0.1.0", path = "../common" }
mtp-codec = { path = "../codec" } mtp-codec = { version = "0.1.0", path = "../codec" }
mtp-transport = { path = "../transport" } mtp-transport = { version = "0.1.0", path = "../transport" }
mtp-crypto = { path = "../crypto", optional = true } mtp-crypto = { version = "0.1.0", path = "../crypto", optional = true }
rand = "0.8" rand = "0.8"
tokio = { version = "1", features = ["time"] } tokio = { version = "1", features = ["time"] }

6
codec/Cargo.toml
View file

@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
mtp-type-map = { path = "../type-map" } mtp-type-map = { version = "0.1.0", path = "../type-map" }
mtp-common = { path = "../common" } mtp-common = { version = "0.1.0", path = "../common" }
mtp-crypto = { path = "../crypto", optional = true } mtp-crypto = { version = "0.1.0", path = "../crypto", optional = true }
base64 = "0.22" base64 = "0.22"
byteorder = "1.5" byteorder = "1.5"
rand = { version = "0.8", features = ["std", "std_rng"] } rand = { version = "0.8", features = ["std", "std_rng"] }

2
example/client/Cargo.toml
View file

@ -8,7 +8,7 @@ name = "client"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
mtp = { path = "../../", features = ["client", "crypto"] } mtp = { version = "0.1.0", path = "../../", features = ["client", "crypto"] }
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
serde_json = "1" serde_json = "1"
hex = "0.4" hex = "0.4"

2
example/server/Cargo.toml
View file

@ -8,7 +8,7 @@ name = "server"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
mtp = { path = "../../", features = ["crypto", "host"] } mtp = { version = "0.1.0", path = "../../", features = ["crypto", "host"] }
rcgen = "0.14" rcgen = "0.14"
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
serde_json = { version = "1" } serde_json = { version = "1" }

3
flake.nix
View file

@ -46,7 +46,7 @@
buildAll = pkgs.writeShellApplication { buildAll = pkgs.writeShellApplication {
name = "mtp-build-all"; name = "mtp-build-all";
runtimeInputs = [rustToolchain pkgs.wasm-pack pkgs.pnpm pkgs.coreutils clippyCheck macheteCheck]; runtimeInputs = [rustToolchain pkgs.cargo-deny pkgs.wasm-pack pkgs.pnpm pkgs.coreutils clippyCheck macheteCheck];
text = '' text = ''
export MTP_TYPE_MAPS="''${MTP_TYPE_MAPS:-$PWD/example/type-maps.yaml}" export MTP_TYPE_MAPS="''${MTP_TYPE_MAPS:-$PWD/example/type-maps.yaml}"
@ -78,6 +78,7 @@
buildInputs = with pkgs; [ buildInputs = with pkgs; [
rustToolchain rustToolchain
cargo-deny
cargo-machete cargo-machete
wasm-pack wasm-pack
pnpm pnpm

8
host/Cargo.toml
View file

@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
mtp-common = { path = "../common" } mtp-common = { version = "0.1.0", path = "../common" }
mtp-codec = { path = "../codec", features = ["registry"] } mtp-codec = { version = "0.1.0", path = "../codec", features = ["registry"] }
mtp-transport = { path = "../transport", features = ["host"] } mtp-transport = { version = "0.1.0", path = "../transport", features = ["host"] }
mtp-crypto = { path = "../crypto", optional = true } mtp-crypto = { version = "0.1.0", path = "../crypto", optional = true }
rand = "0.8" rand = "0.8"
tokio = { version = "1", features = ["time"] } tokio = { version = "1", features = ["time"] }

4
transport/Cargo.toml
View file

@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
mtp-codec = { path = "../codec" } mtp-codec = { version = "0.1.0", path = "../codec" }
mtp-common = { path = "../common" } mtp-common = { version = "0.1.0", path = "../common" }
wtransport = { version = "0.7.1", default-features = false, features = [ wtransport = { version = "0.7.1", default-features = false, features = [
"aws-lc-rs", "aws-lc-rs",
"quinn", "quinn",

8
wasm/Cargo.toml
View file

@ -21,10 +21,10 @@ hex = "0.4"
getrandom = { version = "0.4", features = ["wasm_js"] } getrandom = { version = "0.4", features = ["wasm_js"] }
getrandom-v02 = { package = "getrandom", version = "0.2", features = ["js"] } getrandom-v02 = { package = "getrandom", version = "0.2", features = ["js"] }
mtp-common = { path = "../common" } mtp-common = { version = "0.1.0", path = "../common" }
mtp-type-map = { path = "../type-map" } mtp-type-map = { version = "0.1.0", path = "../type-map" }
mtp-codec = { path = "../codec", features = ["crypto"] } mtp-codec = { version = "0.1.0", path = "../codec", features = ["crypto"] }
mtp-crypto = { path = "../crypto", features = ["wasm"] } mtp-crypto = { version = "0.1.0", path = "../crypto", features = ["wasm"] }
[dev-dependencies] [dev-dependencies]
wasm-bindgen-test = "0.3" wasm-bindgen-test = "0.3"