Restore remote portable progress and resilient relay connections

This commit is contained in:
Дмитрий committed 2026-10-24 11:12:01 +05:00
1 parent 9e9778af74
commit b61a186470
27 files changed
+2579 -145

No files matched your search

+40 -11
View File
@@ -20,6 +20,8 @@ use super::store::{AccountKind, ControlStore};
use super::transport::{self, LinkError};
use crate::{Error, Result};
mod portable_sync;
/// Where and as whom to reach a realm.
#[derive(Clone, Debug)]
pub struct RealmTarget {
@@ -412,9 +414,11 @@ impl PlayerControl {
}
/// Transfer a portable character to a remote realm over the verified control channel (Phase 12.1).
pub fn transfer_character(
fn transfer_with_id(
&self,
ch: &mut PlayerChannel,
transfer_id: Uuid,
owned_session: bool,
character_id: Uuid,
ruleset: &str,
canonical_revision: u64,
@@ -422,16 +426,27 @@ impl PlayerControl {
content_hash: [u8; 32],
collections: BTreeMap<String, Vec<u32>>,
) -> R<RemoteTransferOutcome> {
let transfer_id = Uuid::now_v7();
let content_hash_str = hex::encode(content_hash);
let offer = Request::TransferOffer {
transfer_id,
character_id,
ruleset: ruleset.to_string(),
canonical_revision,
content_hash: content_hash_str.clone(),
total_size: payload.len(),
collections,
let offer = if owned_session {
Request::OwnedTransferOffer {
transfer_id,
character_id,
ruleset: ruleset.to_string(),
canonical_revision,
content_hash: content_hash_str.clone(),
total_size: payload.len(),
collections,
}
} else {
Request::TransferOffer {
transfer_id,
character_id,
ruleset: ruleset.to_string(),
canonical_revision,
content_hash: content_hash_str.clone(),
total_size: payload.len(),
collections,
}
};
let r = ch.request(&offer)?;
let mut offset = match r {
@@ -456,7 +471,21 @@ impl PlayerControl {
notes,
});
}
Response::Error { code, message } => return Err(ControlFail::App { code, message }),
Response::Error { code, message } => {
if owned_session
&& matches!(
code,
AppError::Incompatible
| AppError::NotYours
| AppError::AlreadyClaimed
| AppError::Invalid
)
{
self.store()?
.player_remote_session_remove(character_id, transfer_id)?;
}
return Err(ControlFail::App { code, message });
}
_ => {
return Err(ControlFail::Link(LinkError::Protocol(
"unexpected response to transfer offer".into(),