unom/punktfunk
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 31 Wiki Activity

fix(gamestream): announce the stream marker + lifecycle events on the compat plane

Browse Source 
Only the native punktfunk/1 loop announced the script-facing marker file,
so a Moonlight session left it absent and wrapper scripts took their
"not streaming" branch mid-stream. The GameStream plane now announces
before run() (the marker must exist when the title's wrapper executes)
and retracts before client.disconnected, keeping the native loop's event
order; StreamRef call sites carry the plane/launch fields.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Enrico Bühler
2026-07-19 16:34:20 +02:00
parent f0c511c8fa
commit 0b8e8312a5
3 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/punktfunk-host/src/gamestream/stream.rs
+17 -14
View File
@@ -61,25 +61,28 @@ pub fn start(
// Windows HIGHEST + session tuning) — GameStream previously ran unboosted on Linux.
crate::native::boost_thread_priority(true);
tracing::info!(?cfg, "video stream starting");
// Lifecycle events, plane parity with the native loop (RFC §4): the RTSP layer
// carries no client device name, so `client` is empty here — the `plane` field is
// what hooks key on. `client.connected` fires alongside `stream.started` because a
// Moonlight client has no persistent connection to anchor it to.
let event_stream = crate::events::StreamRef {
mode: crate::events::mode_str(cfg.width, cfg.height, cfg.fps),
// Lifecycle events + the script-facing marker file, plane parity with the native loop
// (RFC §4): `announce` emits `stream.started`/`stream.stopped` and holds the marker for
// the span between. It runs BEFORE `run` because `run` is what launches the app — the
// marker has to exist by the time the title's own wrapper script executes, or the
// wrapper takes its "not streaming" branch mid-stream. The RTSP layer carries no client
// device name, so `client` is empty here — the `plane` field is what hooks key on.
// `client.connected` fires alongside `stream.started` because a Moonlight client has no
// persistent connection to anchor it to.
let stream_marker = crate::stream_marker::announce(crate::stream_marker::StreamInfo {
width: cfg.width,
height: cfg.height,
refresh_hz: cfg.fps,
hdr: cfg.hdr,
client: String::new(),
app: app.as_ref().map(|a| a.title.clone()),
launch: app.as_ref().map(|a| a.title.clone()),
plane: crate::events::Plane::Gamestream,
};
});
let event_client = crate::events::ClientRef {
name: String::new(),
fingerprint: None,
plane: crate::events::Plane::Gamestream,
};
crate::events::emit(crate::events::EventKind::StreamStarted {
stream: event_stream.clone(),
});
crate::events::emit(crate::events::EventKind::ClientConnected {
client: event_client.clone(),
});
@@ -103,9 +106,9 @@ pub fn start(
tracing::error!(error = %format!("{e:#}"), "video stream failed");
}
running.store(false, Ordering::SeqCst);
crate::events::emit(crate::events::EventKind::StreamStopped {
stream: event_stream,
});
// Retract the marker and fire `stream.stopped` — explicitly here, before
// `client.disconnected`, so the compat plane keeps the native loop's event order.
drop(stream_marker);
crate::events::emit(crate::events::EventKind::ClientDisconnected {
client: event_client,
reason,