enricobuehlerandClaude Opus 5
ff01db67ff
Connecting from the 0.22.0 Windows client bounces straight back to the host list, on every host. The shell is fine; the binary it spawns is not.b0ea1e6bwas a `clients/linux` change that also dropped a verbatim copy of the GTK shell into `clients/session/src/` — app.rs, cli.rs, the four ui_*.rs, shortcuts.rs, spawn.rs — and, fatally, OVERWROTE `clients/session/src/main.rs` with the shell's. That file is `[[bin]] punktfunk-session`. So the binary every shell execs for a stream stopped being the Vulkan session and became the GTK shell: - Windows: the shell's `#[cfg(not(target_os = "linux"))]` arm — print "punktfunk-client is Linux-only" to stderr, `exit(2)`. It never writes a single line of the stdout contract, so the shell sees EOF with no `ready`, no `error`, no `ended`, and returns to the host list with a BLANK banner. Exactly the report. - Linux: `app::run()` sees `--connect` in argv and calls `exec_session()`, which execs `punktfunk-session` — itself. A stream is an exec loop. CI could not catch it. The Windows leg of the clobbered file is a three-line stub that compiles perfectly; `cargo build -p punktfunk-client-session` stayed green while building the wrong program. Only running it fails, and nothing runs it.61bdf11ethen read the 327 E0433s on the Linux leg as a missing-manifest bug and declared gtk4/libadwaita/relm4 on this crate. That fixed the build of the wrong file and cemented the clobber. Both go: the copy is deleted, `main.rs` is restored frombf981027(the last commit that touched the real one), and the manifest loses the GTK block plus the gresource build-dep and `data/` that arrived with944c03ddto feed it. serde_json returns to `optional`/`ui`, which is what it always was — the reason `--no-default-features` didn't compile was cli.rs, and cli.rs was never ours. Also closes the hole that made this silent. `SpawnEvent::Exited` now carries the child's exit code, and a child that exits nonzero having said NOTHING gets a banner naming that code instead of an empty string. Code 0 (stream window closed) and -1 (our own Disconnect/Cancel kill) stay silent, as before. A wrong or crashing session binary is now a legible failure rather than a connect that quietly does nothing. Verified. Windows x86_64 on the CI runner: check, clippy -D warnings, rustfmt, tests (5 passed, incl. the new one) all green, and the rebuilt punktfunk-session.exe answers `--connect` with `{"error":"presenter: SDL window: …"}` — the real contract — where 0.22.0's answered with nothing. Linux amd64 in the CI image: check with default AND --no-default-features, clippy -D warnings, rustfmt, tests green, and the built binary emits `{"error":"presenter: SDL video: …"}` + exit 4 instead of exec-looping. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
57 lines
2.8 KiB
TOML
57 lines
2.8 KiB
TOML
[package]
|
|
name = "punktfunk-client-session"
|
|
description = "punktfunk/1 Vulkan session binary — SDL3 window, ash presenter, terminal stats; the power-user / gamescope stream client"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
rust-version.workspace = true
|
|
license.workspace = true
|
|
authors.workspace = true
|
|
repository.workspace = true
|
|
|
|
[[bin]]
|
|
name = "punktfunk-session"
|
|
path = "src/main.rs"
|
|
|
|
[features]
|
|
default = ["ui", "pyrowave"]
|
|
# PyroWave client decode (the wired-LAN wavelet codec) — enables the decode backend + the
|
|
# planar present path. ON by default; each session still opts in explicitly (the Settings
|
|
# codec pick, or PUNKTFUNK_PREFER_PYROWAVE=1). The Windows ARM64 leg builds
|
|
# --no-default-features and so skips it (video decode is Linux-only anyway).
|
|
pyrowave = ["pf-client-core/pyrowave", "pf-presenter/pyrowave"]
|
|
# The Skia console UI (stats OSD, capture HUD, later the gamepad library). Dropping it
|
|
# (`--no-default-features`) is the ~15 MB-smaller power-user build: same streaming,
|
|
# stats on stdout only.
|
|
ui = ["dep:pf-console-ui", "dep:serde_json"]
|
|
|
|
# Same Linux+Windows gating as the rest of the client stack; elsewhere this is a stub
|
|
# binary.
|
|
[target.'cfg(any(target_os = "linux", windows))'.dependencies]
|
|
# `default-features = false` on both: THIS crate's `pyrowave` feature (above) is the single
|
|
# switch that turns the wavelet codec on, and it enables it explicitly on each. Inheriting their
|
|
# defaults instead would make `--no-default-features` a lie — the Windows ARM64 leg builds that
|
|
# way precisely to skip the vendored PyroWave C++, which has no ARM64 SIMD path.
|
|
pf-presenter = { path = "../../crates/pf-presenter", default-features = false }
|
|
pf-console-ui = { path = "../../crates/pf-console-ui", optional = true }
|
|
pf-client-core = { path = "../../crates/pf-client-core", default-features = false }
|
|
punktfunk-core = { path = "../../crates/punktfunk-core", features = ["quic"] }
|
|
# The fake-library dev hook (`PUNKTFUNK_FAKE_LIBRARY`, browse mode) parses GameEntry JSON.
|
|
serde_json = { version = "1", optional = true }
|
|
anyhow = "1"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
|
|
# This crate carries NO toolkit, deliberately: it is the renderer the shells spawn, and the
|
|
# `--no-default-features` build is what a minimal/embedded image installs. GTK4/libadwaita/relm4
|
|
# belong to `clients/linux` (the shell) and must never appear here — a stray copy of the shell's
|
|
# modules landed in src/ once (b0ea1e6b) and dragging its dependencies in behind it is what let
|
|
# the wrong `main.rs` build and ship as `punktfunk-session`.
|
|
|
|
# Embeds the app icon as an exe resource (build.rs) — Windows hosts only (rc.exe from
|
|
# the SDK); same pattern as clients/windows.
|
|
[target.'cfg(windows)'.build-dependencies]
|
|
winresource = "0.1"
|
|
|
|
[lints]
|
|
workspace = true
|