invitation ajustments

This commit is contained in:
yves committed 2026-11-21 10:07:16 +01:00
1 parent 6ac21ccf4c
commit 7eed94d82c
5 files changed
+188 -54

No files matched your search

+42 -19
View File
@@ -669,6 +669,45 @@ impl MeowClient {
server_urls: &[String],
space: Option<&str>,
) -> Result<Vec<u8>> {
let (_, contact, answer, si) = self.prepare_answer(offer_bytes, contact_name, server_urls, space)?;
self.spaces[si].state.contacts.push(contact);
self.save_space(si)?;
Ok(answer.encode_to_vec())
}
/// Step 2 for an offer received by any channel (QR code, file, nearby transfer):
/// answer it and send the answer to the initiator's answer mailbox, which then
/// completes the handshake in the background. Returns the initiator's name.
/// The contact and its answer are saved together.
pub async fn accept_invitation(
&mut self,
offer_bytes: &[u8],
contact_name: Option<&str>,
server_urls: &[String],
space: Option<&str>,
) -> Result<String> {
let (info, contact, answer, si) = self.prepare_answer(offer_bytes, contact_name, server_urls, space)?;
let queued = outbox::item(
&contact.id,
vec![],
&invitation::answer_deposit(&info, &answer),
info.answer_servers.clone(),
);
self.spaces[si].state.contacts.push(contact);
self.spaces[si].state.outbox.push(queued);
self.save_space(si)?;
self.flush(false).await?;
Ok(info.initiator_name)
}
/// Validate an offer and build the answering contact (not stored yet).
fn prepare_answer(
&mut self,
offer_bytes: &[u8],
contact_name: Option<&str>,
server_urls: &[String],
space: Option<&str>,
) -> Result<(OfferInfo, Contact, v2::InvitationMessage, usize)> {
let info = self.inspect_invitation(offer_bytes)?;
let name = contact_name.unwrap_or(&info.initiator_name).to_string();
self.ensure_free_name(&name)?;
@@ -678,9 +717,7 @@ impl MeowClient {
let servers = self.resolve_servers(server_urls)?;
let (contact, answer) = invitation::answer(offer_bytes, &name, self.nickname(), servers, now())?;
let si = self.target_space(space)?;
self.spaces[si].state.contacts.push(contact);
self.save_space(si)?;
Ok(answer.encode_to_vec())
Ok((info, contact, answer, si))
}
fn by_invitation(&self, id: &[u8]) -> Result<(usize, usize)> {
@@ -774,22 +811,8 @@ impl MeowClient {
let Resp::InvFetched(f) = resp else {
return Err(Error::Network("unexpected response".into()));
};
let info = self.inspect_invitation(&f.payload)?;
let answer_bytes = self
.answer_invitation(&f.payload, contact_name, server_urls, space)
.await?;
let answer = v2::InvitationMessage::decode(answer_bytes.as_slice()).map_err(meow_core::Error::from)?;
let (si, ci) = self.by_invitation(&info.invitation_id)?;
let queued = outbox::item(
&self.spaces[si].state.contacts[ci].id,
vec![],
&invitation::answer_deposit(&info, &answer),
info.answer_servers.clone(),
);
self.spaces[si].state.outbox.push(queued);
self.save_space(si)?;
self.flush(false).await?;
Ok(info.initiator_name)
self.accept_invitation(&f.payload, contact_name, server_urls, space)
.await
}
// ───────────────────────── messaging ─────────────────────────
+29
View File
@@ -820,3 +820,32 @@ async fn background_task_wakes_up_on_new_contacts() {
bob.stop().await;
let _ = std::fs::remove_dir_all(&dir);
}
/// One-shot invitation (QR code, file, nearby): only the offer travels out of band.
#[tokio::test(flavor = "multi_thread")]
async fn one_shot_invitation_completes_through_servers() {
let servers = vec![spawn_server().await];
let dir = tmpdir();
let mut alice = client(&dir, "alice", &servers).await;
let mut bob = client(&dir, "bob", &servers).await;
let offer = alice
.create_invitation("Bob", &[], "scan me", 3600, None)
.await
.unwrap();
assert_eq!(bob.accept_invitation(&offer, None, &[], None).await.unwrap(), "alice");
// Accepting twice is refused.
assert!(bob.accept_invitation(&offer, Some("other"), &[], None).await.is_err());
assert_eq!(
no_receipts(alice.sync(Duration::ZERO).await.unwrap()),
vec![Event::InvitationAccepted { contact: "Bob".into() }]
);
bob.sync(Duration::ZERO).await.unwrap();
alice.sync(Duration::ZERO).await.unwrap();
assert_eq!(alice.contact("Bob").unwrap().state, State::Active);
assert_eq!(bob.contact("alice").unwrap().state, State::Active);
assert_eq!(
alice.contact("Bob").unwrap().safety_number(),
bob.contact("alice").unwrap().safety_number()
);
let _ = std::fs::remove_dir_all(&dir);
}
+20
View File
@@ -528,6 +528,26 @@ impl Meow {
.await?))
}
/// Answer an invitation received by any channel (QR code, file, nearby): the
/// answer goes back through the inviter's servers and the handshake completes in
/// the background. Returns the inviter's name.
pub async fn accept_invitation(
&self,
invitation: Vec<u8>,
contact_name: Option<String>,
servers: Vec<String>,
space_password: Option<String>,
) -> Result<String> {
with_client!(self, |c| Ok(c
.accept_invitation(
&invitation,
opt(contact_name).as_deref(),
&servers,
opt(space_password).as_deref()
)
.await?))
}
/// Step 3 (file / QR): returns the confirmation bytes to hand over.
pub async fn accept_answer(&self, answer: Vec<u8>) -> Result<Vec<u8>> {
with_client!(self, |c| Ok(c.accept_answer(&answer).await?))
+89 -33
View File
@@ -40,7 +40,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
default_rust_auto_opaque = RustAutoOpaqueMoi,
);
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.13.0";
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1332212757;
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -1405833860;
// Section: executor
@@ -93,6 +93,61 @@ fn wire__crate__api__meow__Meow_accept_answer_impl(
},
)
}
fn wire__crate__api__meow__Meow_accept_invitation_impl(
port_: flutter_rust_bridge::for_generated::MessagePort,
ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
rust_vec_len_: i32,
data_len_: i32,
) {
FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec, _, _, _>(
flutter_rust_bridge::for_generated::TaskInfo {
debug_name: "Meow_accept_invitation",
port: Some(port_),
mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
},
move || {
let message = unsafe {
flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_)
};
let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
let api_that = <RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Meow>>>::sse_decode(
&mut deserializer,
);
let api_invitation = <Vec<u8>>::sse_decode(&mut deserializer);
let api_contact_name = <Option<String>>::sse_decode(&mut deserializer);
let api_servers = <Vec<String>>::sse_decode(&mut deserializer);
let api_space_password = <Option<String>>::sse_decode(&mut deserializer);
deserializer.end();
move |context| async move {
transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>(
(move || async move {
let mut api_that_guard = None;
let decode_indices_ = flutter_rust_bridge::for_generated::lockable_compute_decode_order(vec![
flutter_rust_bridge::for_generated::LockableOrderInfo::new(&api_that, 0, false),
]);
for i in decode_indices_ {
match i {
0 => api_that_guard = Some(api_that.lockable_decode_async_ref().await),
_ => unreachable!(),
}
}
let api_that_guard = api_that_guard.unwrap();
let output_ok = crate::api::meow::Meow::accept_invitation(
&*api_that_guard,
api_invitation,
api_contact_name,
api_servers,
api_space_password,
)
.await?;
std::result::Result::Ok(output_ok)
})()
.await,
)
}
},
)
}
fn wire__crate__api__meow__Meow_accept_published_invitation_impl(
port_: flutter_rust_bridge::for_generated::MessagePort,
ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
@@ -2031,37 +2086,38 @@ fn pde_ffi_dispatcher_primary_impl(
// Codec=Pde (Serialization + dispatch), see doc to use other codecs
match func_id {
1 => wire__crate__api__meow__Meow_accept_answer_impl(port, ptr, rust_vec_len, data_len),
2 => wire__crate__api__meow__Meow_accept_published_invitation_impl(port, ptr, rust_vec_len, data_len),
3 => wire__crate__api__meow__Meow_add_server_impl(port, ptr, rust_vec_len, data_len),
4 => wire__crate__api__meow__Meow_answer_invitation_impl(port, ptr, rust_vec_len, data_len),
5 => wire__crate__api__meow__Meow_change_password_impl(port, ptr, rust_vec_len, data_len),
6 => wire__crate__api__meow__Meow_close_impl(port, ptr, rust_vec_len, data_len),
7 => wire__crate__api__meow__Meow_contacts_impl(port, ptr, rust_vec_len, data_len),
8 => wire__crate__api__meow__Meow_conversations_impl(port, ptr, rust_vec_len, data_len),
9 => wire__crate__api__meow__Meow_create_impl(port, ptr, rust_vec_len, data_len),
10 => wire__crate__api__meow__Meow_create_invitation_impl(port, ptr, rust_vec_len, data_len),
11 => wire__crate__api__meow__Meow_events_impl(port, ptr, rust_vec_len, data_len),
12 => wire__crate__api__meow__Meow_file_impl(port, ptr, rust_vec_len, data_len),
13 => wire__crate__api__meow__Meow_finalize_invitation_impl(port, ptr, rust_vec_len, data_len),
14 => wire__crate__api__meow__Meow_flush_outbox_impl(port, ptr, rust_vec_len, data_len),
15 => wire__crate__api__meow__Meow_hide_contact_impl(port, ptr, rust_vec_len, data_len),
16 => wire__crate__api__meow__Meow_history_impl(port, ptr, rust_vec_len, data_len),
17 => wire__crate__api__meow__Meow_inspect_invitation_impl(port, ptr, rust_vec_len, data_len),
18 => wire__crate__api__meow__Meow_mark_read_impl(port, ptr, rust_vec_len, data_len),
19 => wire__crate__api__meow__Meow_nickname_impl(port, ptr, rust_vec_len, data_len),
20 => wire__crate__api__meow__Meow_open_impl(port, ptr, rust_vec_len, data_len),
21 => wire__crate__api__meow__Meow_pending_sends_impl(port, ptr, rust_vec_len, data_len),
22 => wire__crate__api__meow__Meow_publish_invitation_impl(port, ptr, rust_vec_len, data_len),
23 => wire__crate__api__meow__Meow_remove_contact_impl(port, ptr, rust_vec_len, data_len),
24 => wire__crate__api__meow__Meow_remove_server_impl(port, ptr, rust_vec_len, data_len),
25 => wire__crate__api__meow__Meow_reveal_contact_impl(port, ptr, rust_vec_len, data_len),
26 => wire__crate__api__meow__Meow_send_file_impl(port, ptr, rust_vec_len, data_len),
27 => wire__crate__api__meow__Meow_send_text_impl(port, ptr, rust_vec_len, data_len),
28 => wire__crate__api__meow__Meow_servers_impl(port, ptr, rust_vec_len, data_len),
29 => wire__crate__api__meow__Meow_set_settings_impl(port, ptr, rust_vec_len, data_len),
30 => wire__crate__api__meow__Meow_settings_impl(port, ptr, rust_vec_len, data_len),
31 => wire__crate__api__meow__Meow_unlock_impl(port, ptr, rust_vec_len, data_len),
33 => wire__crate__api__meow__init_app_impl(port, ptr, rust_vec_len, data_len),
2 => wire__crate__api__meow__Meow_accept_invitation_impl(port, ptr, rust_vec_len, data_len),
3 => wire__crate__api__meow__Meow_accept_published_invitation_impl(port, ptr, rust_vec_len, data_len),
4 => wire__crate__api__meow__Meow_add_server_impl(port, ptr, rust_vec_len, data_len),
5 => wire__crate__api__meow__Meow_answer_invitation_impl(port, ptr, rust_vec_len, data_len),
6 => wire__crate__api__meow__Meow_change_password_impl(port, ptr, rust_vec_len, data_len),
7 => wire__crate__api__meow__Meow_close_impl(port, ptr, rust_vec_len, data_len),
8 => wire__crate__api__meow__Meow_contacts_impl(port, ptr, rust_vec_len, data_len),
9 => wire__crate__api__meow__Meow_conversations_impl(port, ptr, rust_vec_len, data_len),
10 => wire__crate__api__meow__Meow_create_impl(port, ptr, rust_vec_len, data_len),
11 => wire__crate__api__meow__Meow_create_invitation_impl(port, ptr, rust_vec_len, data_len),
12 => wire__crate__api__meow__Meow_events_impl(port, ptr, rust_vec_len, data_len),
13 => wire__crate__api__meow__Meow_file_impl(port, ptr, rust_vec_len, data_len),
14 => wire__crate__api__meow__Meow_finalize_invitation_impl(port, ptr, rust_vec_len, data_len),
15 => wire__crate__api__meow__Meow_flush_outbox_impl(port, ptr, rust_vec_len, data_len),
16 => wire__crate__api__meow__Meow_hide_contact_impl(port, ptr, rust_vec_len, data_len),
17 => wire__crate__api__meow__Meow_history_impl(port, ptr, rust_vec_len, data_len),
18 => wire__crate__api__meow__Meow_inspect_invitation_impl(port, ptr, rust_vec_len, data_len),
19 => wire__crate__api__meow__Meow_mark_read_impl(port, ptr, rust_vec_len, data_len),
20 => wire__crate__api__meow__Meow_nickname_impl(port, ptr, rust_vec_len, data_len),
21 => wire__crate__api__meow__Meow_open_impl(port, ptr, rust_vec_len, data_len),
22 => wire__crate__api__meow__Meow_pending_sends_impl(port, ptr, rust_vec_len, data_len),
23 => wire__crate__api__meow__Meow_publish_invitation_impl(port, ptr, rust_vec_len, data_len),
24 => wire__crate__api__meow__Meow_remove_contact_impl(port, ptr, rust_vec_len, data_len),
25 => wire__crate__api__meow__Meow_remove_server_impl(port, ptr, rust_vec_len, data_len),
26 => wire__crate__api__meow__Meow_reveal_contact_impl(port, ptr, rust_vec_len, data_len),
27 => wire__crate__api__meow__Meow_send_file_impl(port, ptr, rust_vec_len, data_len),
28 => wire__crate__api__meow__Meow_send_text_impl(port, ptr, rust_vec_len, data_len),
29 => wire__crate__api__meow__Meow_servers_impl(port, ptr, rust_vec_len, data_len),
30 => wire__crate__api__meow__Meow_set_settings_impl(port, ptr, rust_vec_len, data_len),
31 => wire__crate__api__meow__Meow_settings_impl(port, ptr, rust_vec_len, data_len),
32 => wire__crate__api__meow__Meow_unlock_impl(port, ptr, rust_vec_len, data_len),
34 => wire__crate__api__meow__init_app_impl(port, ptr, rust_vec_len, data_len),
_ => unreachable!(),
}
}
@@ -2074,7 +2130,7 @@ fn pde_ffi_dispatcher_sync_impl(
) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
// Codec=Pde (Serialization + dispatch), see doc to use other codecs
match func_id {
32 => wire__crate__api__meow__core_version_impl(ptr, rust_vec_len, data_len),
33 => wire__crate__api__meow__core_version_impl(ptr, rust_vec_len, data_len),
_ => unreachable!(),
}
}