mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
Nexus moved its Xodus changes from patch files in xodus-nexus into a backend fork (domsvoboda/nexus-backend, GPL-3.0). prepare.py now fetches that fork at backend-v0.2.15 (e7884a27, same Xodus base 53ea781d, same Rust 1.99.0) and applies the DroidDeck patches, rebased onto it: - droiddeck-credentials, -launch-view, -library-subscriptions: same rebase as Bannerlator's 0.2.15 update (identical patches before and after). - droiddeck-credential-fallback, -credential-diagnostics: applied unchanged. - droiddeck-cloud-token: session::prepare now also returns the account snapshot; the ticket checks it like upstream's profile/social commands. - droiddeck-licensing-device-ticket: upstream 0.2.15 already formats delegation-compact device tickets for Store license tokens (27c335e), so only the content licensing path is patched. Upstream now writes compact JWE delegation tickets as t=, so the d= prefix check is replaced by the token type, the same rule as upstream's store_license.rs. droiddeck-xbox-ticket.patch is dropped: upstream sends compact JWE delegation tickets to Xbox Live sign-in in a form it accepts, with tests. Runtime: domsvoboda/nexus-runtime runtime-11.0-20261102-g76c6dd13 (was xodus-nexus runtime-11.0-20261018). Same six modules at the same path; xgameruntime.dll is the C++ implementation (nexus-xgameruntime 455b1ba9). Archive sha512 from the release's .sha512sum, source sha256 from its candidate.json, module sha256 from the extracted files. The PlayFab Game Saves proxy is a newer build at the same path and still passes droiddeck-xbox's export checks; its license moved to share/doc/nexus-runtime/. DLC mounting: the C++ runtime mounts downloadable content only inside a host-managed workspace named by XODUS_MOUNT_ROOT (src/System/Package/Mount.h returns E_NOTIMPL without it). DroidDeck starts Wine itself (droiddeck:prepare), so droiddeck-dlc-mount.patch (ported from Bannerlator) creates the workspace in the launch directory for the prepare session and reports it as mountRoot; XboxRuntime passes it in the xbox-prepare reply and droiddeck-xbox sets XODUS_MOUNT_ROOT to its Z: path. XODUS_CONTENT_ROOTS is unchanged and still read by the runtime. Upstream fixes since the old pins include sign-in for some accounts, offline play, cloud-save conflict handling, DLC mounting, duplicate token requests and per-game fixes (Ori, AoE, MSFS, Forza Motorsport).
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
diff --git a/crates/xodus-cli/src/commands/run.rs b/crates/xodus-cli/src/commands/run.rs
|
|
index 72a2c97..c3d5774 100644
|
|
--- a/crates/xodus-cli/src/commands/run.rs
|
|
+++ b/crates/xodus-cli/src/commands/run.rs
|
|
@@ -1043,14 +1043,25 @@ pub async fn run(
|
|
if wine == "droiddeck:prepare" {
|
|
use std::io::Write;
|
|
if !materialize_chain { return ExitCode::FAILURE; }
|
|
+ // The app starts Wine itself, so the DLC mount workspace the runtime requires (XODUS_MOUNT_ROOT) is
|
|
+ // made here in TMPDIR, the launch directory, and lives as long as this prepare session.
|
|
+ let mount_workspace = Builder::new().prefix(MOUNT_WORKSPACE_PREFIX.trim_start_matches('.'))
|
|
+ .permissions(std::fs::Permissions::from_mode(0o700)).tempdir()
|
|
+ .and_then(|directory| DlcMountWorkspace::from_view(LaunchView::new(directory)))
|
|
+ .inspect_err(|error| eprintln!("could not prepare downloadable content workspace: {error}"))
|
|
+ .ok();
|
|
+ let mount_root = mount_workspace.as_ref().and_then(|workspace| workspace.view.as_ref())
|
|
+ .map(|view| view.path().to_string_lossy().into_owned());
|
|
let ready = serde_json::json!({
|
|
"exe": stub_path,
|
|
"playfab": playfab_auth_header(client, tokens).await,
|
|
+ "mountRoot": mount_root,
|
|
});
|
|
println!("DROIDDECK_LAUNCH_V1 {}", ready);
|
|
let _ = std::io::stdout().flush();
|
|
let mut release = String::new();
|
|
let _ = std::io::stdin().read_line(&mut release);
|
|
+ drop(mount_workspace);
|
|
drop(launch_mirror);
|
|
cleanup().await;
|
|
return ExitCode::SUCCESS;
|