chat adjustments
This commit is contained in:
1 parent
5532a7ce06
commit
6ac21ccf4c
5 files changed
+246
-44
No files matched your search
+5
-3
@@ -17,13 +17,15 @@ Pour reprendre le travail : lire ce fichier, prendre le premier lot ⬜ dont les
|
|||||||
1. ~~**3.8** livraison au moins une fois~~ ✅
|
1. ~~**3.8** livraison au moins une fois~~ ✅
|
||||||
2. ~~**4.5** brancher `meow-store` dans le client et la CLI~~ ✅
|
2. ~~**4.5** brancher `meow-store` dans le client et la CLI~~ ✅
|
||||||
3. ~~5.5, 5.6, 5.9, 5.10~~ ✅
|
3. ~~5.5, 5.6, 5.9, 5.10~~ ✅
|
||||||
4. ~~7.1, 7.2~~ ✅, puis **7.3 → 7.8** nouvelle application Flutter (from scratch, voir phase 7).
|
4. ~~7.1 → 7.4~~ ✅, puis **7.5 → 7.8** (invitations, espaces cachés, Android en arrière-plan, retrait de la v1).
|
||||||
5. Le reste (phases 8–10) selon les priorités.
|
5. Le reste (phases 8–10) selon les priorités.
|
||||||
|
|
||||||
### Journal
|
### Journal
|
||||||
|
|
||||||
| Date | Lots | Notes |
|
| Date | Lots | Notes |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
|
| 2026-11-21 | 7.4 | Identifiant d'application `im.bastet.bastet` (Android et Linux). Rust : `conversation_summary` (dernier message et non-lus, comptés à rebours par segments) et `Meow::conversations()` triées par activité. Flutter : flux d'événements unique par session, `conversationsProvider` (rafraîchi par les événements, avec anti-rebond) et `chatProvider` (famille par contact : segments, fusion du dernier segment, accusés appliqués sur place). Écrans de liste et de conversation, fiche contact, `file_picker` 13. Test d'intégration : Bob (identité FFI) accepte une invitation, écrit ; l'application affiche, répond depuis le champ de saisie ; Bob reçoit la réponse et l'accusé de lecture. Corrigés en route : le raccourci Entrée lisait un état périmé ; les SnackBars couvraient le champ de saisie sur bureau (largeur limitée sur grand écran). Formateur Dart à 120 colonnes. |
|
||||||
|
| 2026-11-21 | 7.3 | Nouvelle application `../bastet` : Riverpod 3, session, thème sable conçu pour Material 3 (palette dérivée de Papyrus, contrastes vérifiés par test), écrans d'accueil, de déverrouillage, des conversations, des réglages et des serveurs, adaptatifs (bureau : panneau de marque et rail ; mobile : barre du bas). i18n en/fr (ARB). Sans `google_fonts` (fuite vers Google). Outil de captures `tool/screenshots_test.dart`. Test d'intégration réel sur Linux (création, serveur, verrouillage, mauvais mot de passe, déverrouillage). Corrigés en route : tailles de police perdues dans le thème (géométrie typographique absente), focus après une erreur de déverrouillage. Vérifié aussi sur l'émulateur Android. |
|
||||||
| 2026-11-21 | 7.2 | `scripts/build-ffi.sh` ; `cargo-ndk` 4.1.2 et cibles Android installés. Linux : cible CMake `meow_ffi`, bibliothèque installée dans le bundle. Android : tâche Gradle `buildMeowFfi` avant `preBuild` (ABI déduites de `-Ptarget-platform`). `core_version()` sert de témoin de chargement, vérifié par une application de release Linux, une de debug Linux, et un APK debug lancé sur l'émulateur android-35 (journal : `bastet: meow 0.2.0 / protocol v2`). `main.dart` est provisoire jusqu'au 7.3. |
|
| 2026-11-21 | 7.2 | `scripts/build-ffi.sh` ; `cargo-ndk` 4.1.2 et cibles Android installés. Linux : cible CMake `meow_ffi`, bibliothèque installée dans le bundle. Android : tâche Gradle `buildMeowFfi` avant `preBuild` (ABI déduites de `-Ptarget-platform`). `core_version()` sert de témoin de chargement, vérifié par une application de release Linux, une de debug Linux, et un APK debug lancé sur l'émulateur android-35 (journal : `bastet: meow 0.2.0 / protocol v2`). `main.dart` est provisoire jusqu'au 7.3. |
|
||||||
| 2026-11-20 | 7.1 | `meow-ffi` avec `flutter_rust_bridge` 2.13.0 (codegen installé avec `cargo install`) ; Dart généré dans `../bastet/lib/src/rust` (`freezed` pour `MeowEvent`). Runtime tokio propre à la crate. `send_file_data` ajouté au client. **Défaut trouvé par le test Dart** : la tâche de fond ne voyait pas un premier contact ajouté pendant son attente de 30 s ; corrigé par un compteur `watch` des changements, avec un test Rust de non-régression. Tests Dart (identité, mauvais mot de passe, verrou, invitation, messages, accusés, fichiers, contact caché) verts ; 46 tests Rust. |
|
| 2026-11-20 | 7.1 | `meow-ffi` avec `flutter_rust_bridge` 2.13.0 (codegen installé avec `cargo install`) ; Dart généré dans `../bastet/lib/src/rust` (`freezed` pour `MeowEvent`). Runtime tokio propre à la crate. `send_file_data` ajouté au client. **Défaut trouvé par le test Dart** : la tâche de fond ne voyait pas un premier contact ajouté pendant son attente de 30 s ; corrigé par un compteur `watch` des changements, avec un test Rust de non-régression. Tests Dart (identité, mauvais mot de passe, verrou, invitation, messages, accusés, fichiers, contact caché) verts ; 46 tests Rust. |
|
||||||
| 2026-11-20 | 5.10 | `create_invitation`, `answer_invitation`, `publish_invitation` et `accept_published_invitation` prennent `space: Option<&str>` : le contact naît directement dans l'espace caché (ouvert ou créé), l'espace principal n'est pas écrit. CLI : `--space-password` sur les quatre commandes d'invitation. Test client (serveur et fichier, caché des deux côtés) et section e2e. Phase 7 réécrite : nouvelle application dans `../bastet`, chat maison. |
|
| 2026-11-20 | 5.10 | `create_invitation`, `answer_invitation`, `publish_invitation` et `accept_published_invitation` prennent `space: Option<&str>` : le contact naît directement dans l'espace caché (ouvert ou créé), l'espace principal n'est pas écrit. CLI : `--space-password` sur les quatre commandes d'invitation. Test client (serveur et fichier, caché des deux côtés) et section e2e. Phase 7 réécrite : nouvelle application dans `../bastet`, chat maison. |
|
||||||
@@ -131,8 +133,8 @@ conversation est un widget maison, léger. On réutilise de la v1 :
|
|||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| 7.1 | Crate `meow-ffi` (cdylib, `flutter_rust_bridge` 2.13.0) : objet `Meow` miroir de `ClientHandle` (create/open/close/unlock, serveurs, contacts, invitations, envoi de texte et de fichiers en octets, historique paginé, réglages, file d'envoi) + `Stream<MeowEvent>` | `scripts/ffi-test.sh` : génération, build, tests Dart verts | ✅ |
|
| 7.1 | Crate `meow-ffi` (cdylib, `flutter_rust_bridge` 2.13.0) : objet `Meow` miroir de `ClientHandle` (create/open/close/unlock, serveurs, contacts, invitations, envoi de texte et de fichiers en octets, historique paginé, réglages, file d'envoi) + `Stream<MeowEvent>` | `scripts/ffi-test.sh` : génération, build, tests Dart verts | ✅ |
|
||||||
| 7.2 | Builds Android (`cargo-ndk` : arm64-v8a, armeabi-v7a, x86_64) et Linux via `scripts/build-ffi.sh`, branchés dans CMake (Linux) et Gradle (Android) : `flutter run` et `flutter build` compilent et embarquent le cœur | `libmeow_ffi.so` chargée par l'application (Linux et émulateur Android) | ✅ |
|
| 7.2 | Builds Android (`cargo-ndk` : arm64-v8a, armeabi-v7a, x86_64) et Linux via `scripts/build-ffi.sh`, branchés dans CMake (Linux) et Gradle (Android) : `flutter run` et `flutter build` compilent et embarquent le cœur | `libmeow_ffi.so` chargée par l'application (Linux et émulateur Android) | ✅ |
|
||||||
| 7.3 | Squelette de l'application : architecture (état, navigation), **écrans repensés, plus professionnels, en teintes sable (clair et sombre)** à partir du thème de la v1, icônes et traductions, écran de déverrouillage (un seul champ : mot de passe principal ou caché), création d'identité, serveurs | Lancement Linux | ⬜ |
|
| 7.3 | Squelette de l'application : Riverpod, session (welcome → unlock → home), **thème sable clair/sombre** (contrastes WCAG testés), navigation adaptative (rail / barre), écrans création d'identité, déverrouillage, conversations (état vide), réglages (apparence, accusés, mot de passe, verrouillage), serveurs ; i18n en/fr ; icônes v1 | Lancement Linux et Android, test d'intégration réel | ✅ |
|
||||||
| 7.4 | Liste des contacts + **écran de conversation maison** : liste virtualisée chargée segment par segment, statuts (envoi, reçu, lu), accusés, fichiers, file d'envoi | Chat fonctionnel sur Linux | ⬜ |
|
| 7.4 | Liste des conversations (dernier message, non-lus, statuts, invitations en attente, contacts cachés) + **écran de conversation maison** : liste inversée chargée segment par segment, bulles groupées, séparateurs de jours, statuts (✓, ✓✓, lu), fichiers (envoi en octets, enregistrement), Entrée pour envoyer, lu à l'ouverture, fiche contact (numéro de sécurité, suppression). Maître-détail sur grand écran | Échange réel testé de bout en bout (test d'intégration) | ✅ |
|
||||||
| 7.5 | Invitations : par serveur (lien + mot de passe), par fichier ou QR, et en présentiel via `peer_secure` (BLE/LAN) qui transporte les octets d'invitation v2 | e2e manuel entre deux appareils | ⬜ |
|
| 7.5 | Invitations : par serveur (lien + mot de passe), par fichier ou QR, et en présentiel via `peer_secure` (BLE/LAN) qui transporte les octets d'invitation v2 | e2e manuel entre deux appareils | ⬜ |
|
||||||
| 7.6 | Espaces cachés dans l'UI (cacher/révéler, inviter dans un espace caché, aucune trace visuelle sans déverrouillage), réglages (accusés, mot de passe) | | ⬜ |
|
| 7.6 | Espaces cachés dans l'UI (cacher/révéler, inviter dans un espace caché, aucune trace visuelle sans déverrouillage), réglages (accusés, mot de passe) | | ⬜ |
|
||||||
| 7.7 | Android : synchronisation en arrière-plan (service ou WorkManager) et notifications **sans le texte des messages** | Notifications | ⬜ |
|
| 7.7 | Android : synchronisation en arrière-plan (service ou WorkManager) et notifications **sans le texte des messages** | Notifications | ⬜ |
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ use std::path::Path;
|
|||||||
use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
use futures_util::future::join_all;
|
use futures_util::future::join_all;
|
||||||
use meow_core::contact::{Contact, ContactState};
|
use meow_core::contact::ContactState;
|
||||||
use meow_core::invitation::{self, OfferInfo};
|
use meow_core::invitation::{self, OfferInfo};
|
||||||
use meow_core::server::canonical_url;
|
use meow_core::server::canonical_url;
|
||||||
use meow_core::{messaging, rpc};
|
use meow_core::{messaging, rpc};
|
||||||
@@ -37,6 +37,7 @@ use meow_proto::Message;
|
|||||||
use meow_store::{Batch, RetiredMailbox, SpaceId, State as SpaceState, Store};
|
use meow_store::{Batch, RetiredMailbox, SpaceId, State as SpaceState, Store};
|
||||||
|
|
||||||
pub use background::{BackgroundOptions, ClientHandle};
|
pub use background::{BackgroundOptions, ClientHandle};
|
||||||
|
pub use meow_core::contact::Contact;
|
||||||
pub use meow_core::contact::ContactState as State;
|
pub use meow_core::contact::ContactState as State;
|
||||||
pub use meow_core::server::ServerInfo;
|
pub use meow_core::server::ServerInfo;
|
||||||
pub use meow_proto::PROTOCOL_VERSION;
|
pub use meow_proto::PROTOCOL_VERSION;
|
||||||
@@ -150,6 +151,17 @@ pub struct SendReport {
|
|||||||
pub delivered_to: usize,
|
pub delivered_to: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Last message and unread count of a conversation ([`MeowClient::conversation_summary`]).
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct ConversationSummary {
|
||||||
|
pub last: Option<HistoryEntry>,
|
||||||
|
/// Received messages not read yet (counted back to the last read or sent one).
|
||||||
|
pub unread: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Segments scanned at most to count unread messages.
|
||||||
|
const SUMMARY_MAX_PAGES: usize = 8;
|
||||||
|
|
||||||
/// Events kept for slow subscribers.
|
/// Events kept for slow subscribers.
|
||||||
const EVENT_BUFFER: usize = 256;
|
const EVENT_BUFFER: usize = 256;
|
||||||
|
|
||||||
@@ -552,6 +564,35 @@ impl MeowClient {
|
|||||||
Ok(lock(&self.store)?.history(sp.id, &sp.state.contacts[ci].id, page)?)
|
Ok(lock(&self.store)?.history(sp.id, &sp.state.contacts[ci].id, page)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Last message and number of unread received messages of a conversation. Unread
|
||||||
|
/// messages are counted from the latest segment backwards, stopping at the first
|
||||||
|
/// segment that contains a read or sent message (at most [`SUMMARY_MAX_PAGES`]).
|
||||||
|
pub fn conversation_summary(&self, name: &str) -> Result<ConversationSummary> {
|
||||||
|
let (si, ci) = self.locate(name)?;
|
||||||
|
let sp = &self.spaces[si];
|
||||||
|
let cid = &sp.state.contacts[ci].id;
|
||||||
|
let store = lock(&self.store)?;
|
||||||
|
let mut page = store.history(sp.id, cid, None)?;
|
||||||
|
let last = page.entries.last().cloned();
|
||||||
|
let mut unread = 0;
|
||||||
|
for _ in 0..SUMMARY_MAX_PAGES {
|
||||||
|
let mut stop = false;
|
||||||
|
for e in page.entries.iter().rev() {
|
||||||
|
if !e.outbound && e.status < Status::Read {
|
||||||
|
unread += 1;
|
||||||
|
} else {
|
||||||
|
stop = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match page.prev {
|
||||||
|
Some(p) if !stop => page = store.history(sp.id, cid, Some(p))?,
|
||||||
|
_ => break,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(ConversationSummary { last, unread })
|
||||||
|
}
|
||||||
|
|
||||||
/// Mark every received message of a conversation as read, and tell the contact
|
/// Mark every received message of a conversation as read, and tell the contact
|
||||||
/// (unless read receipts are off). Returns how many messages changed.
|
/// (unless read receipts are off). Returns how many messages changed.
|
||||||
pub async fn mark_read(&mut self, name: &str) -> Result<usize> {
|
pub async fn mark_read(&mut self, name: &str) -> Result<usize> {
|
||||||
|
|||||||
@@ -587,10 +587,14 @@ async fn delivery_and_read_receipts() {
|
|||||||
vec![Status::Delivered, Status::Delivered]
|
vec![Status::Delivered, Status::Delivered]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let summary = bob.conversation_summary("alice").unwrap();
|
||||||
|
assert_eq!(summary.unread, 2);
|
||||||
|
assert!(matches!(summary.last.unwrap().content, meow_client::Content::Text(ref t) if t == "two"));
|
||||||
// Bob reads.
|
// Bob reads.
|
||||||
assert_eq!(bob.mark_read("alice").await.unwrap(), 2);
|
assert_eq!(bob.mark_read("alice").await.unwrap(), 2);
|
||||||
assert_eq!(bob.mark_read("alice").await.unwrap(), 0);
|
assert_eq!(bob.mark_read("alice").await.unwrap(), 0);
|
||||||
assert_eq!(statuses(&bob, "alice", false), vec![Status::Read, Status::Read]);
|
assert_eq!(statuses(&bob, "alice", false), vec![Status::Read, Status::Read]);
|
||||||
|
assert_eq!(bob.conversation_summary("alice").unwrap().unread, 0);
|
||||||
let ev = alice.sync(Duration::ZERO).await.unwrap();
|
let ev = alice.sync(Duration::ZERO).await.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
ev,
|
ev,
|
||||||
|
|||||||
@@ -113,6 +113,13 @@ pub struct MessageView {
|
|||||||
pub status: MessageStatus,
|
pub status: MessageStatus,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A conversation as listed: the contact, its latest message and unread count.
|
||||||
|
pub struct ConversationView {
|
||||||
|
pub contact: ContactView,
|
||||||
|
pub last_message: Option<MessageView>,
|
||||||
|
pub unread: u32,
|
||||||
|
}
|
||||||
|
|
||||||
/// One segment of a conversation, oldest message first.
|
/// One segment of a conversation, oldest message first.
|
||||||
pub struct HistoryPageView {
|
pub struct HistoryPageView {
|
||||||
pub messages: Vec<MessageView>,
|
pub messages: Vec<MessageView>,
|
||||||
@@ -246,6 +253,24 @@ fn message_view(h: meow_client::HistoryEntry) -> MessageView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn contact_view(c: &MeowClient, k: &meow_client::Contact) -> Result<ContactView> {
|
||||||
|
Ok(ContactView {
|
||||||
|
id: k.id.0.clone(),
|
||||||
|
name: k.name.clone(),
|
||||||
|
my_name: k.my_name.clone(),
|
||||||
|
peer_name: k.peer.as_ref().map(|p| p.name.clone()),
|
||||||
|
status: match k.state {
|
||||||
|
meow_client::State::OfferSent => ContactStatus::OfferSent,
|
||||||
|
meow_client::State::AnswerSent => ContactStatus::AnswerSent,
|
||||||
|
meow_client::State::ConfirmSent => ContactStatus::ConfirmSent,
|
||||||
|
meow_client::State::Active => ContactStatus::Active,
|
||||||
|
},
|
||||||
|
hidden: c.is_hidden(&k.name)?,
|
||||||
|
safety_number: k.safety_number(),
|
||||||
|
created_at: k.created_at as i64,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn server_view(s: &meow_client::ServerInfo) -> ServerView {
|
fn server_view(s: &meow_client::ServerInfo) -> ServerView {
|
||||||
ServerView {
|
ServerView {
|
||||||
url: s.url.clone(),
|
url: s.url.clone(),
|
||||||
@@ -421,25 +446,27 @@ impl Meow {
|
|||||||
// ── contacts ──
|
// ── contacts ──
|
||||||
|
|
||||||
pub async fn contacts(&self) -> Result<Vec<ContactView>> {
|
pub async fn contacts(&self) -> Result<Vec<ContactView>> {
|
||||||
|
with_client!(self, |c| c.contacts().into_iter().map(|k| contact_view(c, k)).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every conversation (one per contact), most recent activity first.
|
||||||
|
pub async fn conversations(&self) -> Result<Vec<ConversationView>> {
|
||||||
with_client!(self, |c| {
|
with_client!(self, |c| {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
for k in c.contacts() {
|
for k in c.contacts() {
|
||||||
out.push(ContactView {
|
let s = c.conversation_summary(&k.name)?;
|
||||||
id: k.id.0.clone(),
|
out.push(ConversationView {
|
||||||
name: k.name.clone(),
|
contact: contact_view(c, k)?,
|
||||||
my_name: k.my_name.clone(),
|
last_message: s.last.map(message_view),
|
||||||
peer_name: k.peer.as_ref().map(|p| p.name.clone()),
|
unread: s.unread as u32,
|
||||||
status: match k.state {
|
|
||||||
meow_client::State::OfferSent => ContactStatus::OfferSent,
|
|
||||||
meow_client::State::AnswerSent => ContactStatus::AnswerSent,
|
|
||||||
meow_client::State::ConfirmSent => ContactStatus::ConfirmSent,
|
|
||||||
meow_client::State::Active => ContactStatus::Active,
|
|
||||||
},
|
|
||||||
hidden: c.is_hidden(&k.name)?,
|
|
||||||
safety_number: k.safety_number(),
|
|
||||||
created_at: k.created_at as i64,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
let activity = |v: &ConversationView| {
|
||||||
|
v.last_message
|
||||||
|
.as_ref()
|
||||||
|
.map_or(v.contact.created_at * 1000, |m| m.sent_at_ms.max(m.received_at * 1000))
|
||||||
|
};
|
||||||
|
out.sort_by_key(|v| std::cmp::Reverse(activity(v)));
|
||||||
Ok(out)
|
Ok(out)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
|
|||||||
default_rust_auto_opaque = RustAutoOpaqueMoi,
|
default_rust_auto_opaque = RustAutoOpaqueMoi,
|
||||||
);
|
);
|
||||||
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.13.0";
|
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.13.0";
|
||||||
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1531542945;
|
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1332212757;
|
||||||
|
|
||||||
// Section: executor
|
// Section: executor
|
||||||
|
|
||||||
@@ -384,6 +384,50 @@ fn wire__crate__api__meow__Meow_contacts_impl(
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
fn wire__crate__api__meow__Meow_conversations_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_conversations",
|
||||||
|
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,
|
||||||
|
);
|
||||||
|
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::conversations(&*api_that_guard).await?;
|
||||||
|
std::result::Result::Ok(output_ok)
|
||||||
|
})()
|
||||||
|
.await,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
fn wire__crate__api__meow__Meow_create_impl(
|
fn wire__crate__api__meow__Meow_create_impl(
|
||||||
port_: flutter_rust_bridge::for_generated::MessagePort,
|
port_: flutter_rust_bridge::for_generated::MessagePort,
|
||||||
ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
|
ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
|
||||||
@@ -1582,6 +1626,20 @@ impl SseDecode for crate::api::meow::ContactView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl SseDecode for crate::api::meow::ConversationView {
|
||||||
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
|
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
||||||
|
let mut var_contact = <crate::api::meow::ContactView>::sse_decode(deserializer);
|
||||||
|
let mut var_lastMessage = <Option<crate::api::meow::MessageView>>::sse_decode(deserializer);
|
||||||
|
let mut var_unread = <u32>::sse_decode(deserializer);
|
||||||
|
return crate::api::meow::ConversationView {
|
||||||
|
contact: var_contact,
|
||||||
|
last_message: var_lastMessage,
|
||||||
|
unread: var_unread,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SseDecode for crate::api::meow::HistoryPageView {
|
impl SseDecode for crate::api::meow::HistoryPageView {
|
||||||
// Codec=Sse (Serialization based), see doc to use other codecs
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
||||||
@@ -1650,6 +1708,18 @@ impl SseDecode for Vec<crate::api::meow::ContactView> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl SseDecode for Vec<crate::api::meow::ConversationView> {
|
||||||
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
|
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
||||||
|
let mut len_ = <i32>::sse_decode(deserializer);
|
||||||
|
let mut ans_ = Vec::with_capacity(len_ as usize);
|
||||||
|
for idx_ in 0..len_ {
|
||||||
|
ans_.push(<crate::api::meow::ConversationView>::sse_decode(deserializer));
|
||||||
|
}
|
||||||
|
return ans_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SseDecode for Vec<Vec<u8>> {
|
impl SseDecode for Vec<Vec<u8>> {
|
||||||
// Codec=Sse (Serialization based), see doc to use other codecs
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
||||||
@@ -1836,6 +1906,17 @@ impl SseDecode for Option<i64> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl SseDecode for Option<crate::api::meow::MessageView> {
|
||||||
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
|
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
||||||
|
if (<bool>::sse_decode(deserializer)) {
|
||||||
|
return Some(<crate::api::meow::MessageView>::sse_decode(deserializer));
|
||||||
|
} else {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SseDecode for Option<u32> {
|
impl SseDecode for Option<u32> {
|
||||||
// Codec=Sse (Serialization based), see doc to use other codecs
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
|
||||||
@@ -1956,30 +2037,31 @@ fn pde_ffi_dispatcher_primary_impl(
|
|||||||
5 => wire__crate__api__meow__Meow_change_password_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),
|
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),
|
7 => wire__crate__api__meow__Meow_contacts_impl(port, ptr, rust_vec_len, data_len),
|
||||||
8 => wire__crate__api__meow__Meow_create_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_invitation_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_events_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_file_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_finalize_invitation_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_flush_outbox_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_hide_contact_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_history_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_inspect_invitation_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_mark_read_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_nickname_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_open_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_pending_sends_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_publish_invitation_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_remove_contact_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_server_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_reveal_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_send_file_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_text_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_servers_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_set_settings_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_settings_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_unlock_impl(port, ptr, rust_vec_len, data_len),
|
30 => wire__crate__api__meow__Meow_settings_impl(port, ptr, rust_vec_len, data_len),
|
||||||
32 => wire__crate__api__meow__init_app_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),
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1992,7 +2074,7 @@ fn pde_ffi_dispatcher_sync_impl(
|
|||||||
) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
|
) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
|
||||||
// Codec=Pde (Serialization + dispatch), see doc to use other codecs
|
// Codec=Pde (Serialization + dispatch), see doc to use other codecs
|
||||||
match func_id {
|
match func_id {
|
||||||
31 => wire__crate__api__meow__core_version_impl(ptr, rust_vec_len, data_len),
|
32 => wire__crate__api__meow__core_version_impl(ptr, rust_vec_len, data_len),
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2054,6 +2136,23 @@ impl flutter_rust_bridge::IntoIntoDart<crate::api::meow::ContactView> for crate:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Codec=Dco (DartCObject based), see doc to use other codecs
|
// Codec=Dco (DartCObject based), see doc to use other codecs
|
||||||
|
impl flutter_rust_bridge::IntoDart for crate::api::meow::ConversationView {
|
||||||
|
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
|
||||||
|
[
|
||||||
|
self.contact.into_into_dart().into_dart(),
|
||||||
|
self.last_message.into_into_dart().into_dart(),
|
||||||
|
self.unread.into_into_dart().into_dart(),
|
||||||
|
]
|
||||||
|
.into_dart()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive for crate::api::meow::ConversationView {}
|
||||||
|
impl flutter_rust_bridge::IntoIntoDart<crate::api::meow::ConversationView> for crate::api::meow::ConversationView {
|
||||||
|
fn into_into_dart(self) -> crate::api::meow::ConversationView {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Codec=Dco (DartCObject based), see doc to use other codecs
|
||||||
impl flutter_rust_bridge::IntoDart for crate::api::meow::HistoryPageView {
|
impl flutter_rust_bridge::IntoDart for crate::api::meow::HistoryPageView {
|
||||||
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
|
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
|
||||||
[
|
[
|
||||||
@@ -2344,6 +2443,15 @@ impl SseEncode for crate::api::meow::ContactView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl SseEncode for crate::api::meow::ConversationView {
|
||||||
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
|
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
||||||
|
<crate::api::meow::ContactView>::sse_encode(self.contact, serializer);
|
||||||
|
<Option<crate::api::meow::MessageView>>::sse_encode(self.last_message, serializer);
|
||||||
|
<u32>::sse_encode(self.unread, serializer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SseEncode for crate::api::meow::HistoryPageView {
|
impl SseEncode for crate::api::meow::HistoryPageView {
|
||||||
// Codec=Sse (Serialization based), see doc to use other codecs
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
||||||
@@ -2397,6 +2505,16 @@ impl SseEncode for Vec<crate::api::meow::ContactView> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl SseEncode for Vec<crate::api::meow::ConversationView> {
|
||||||
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
|
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
||||||
|
<i32>::sse_encode(self.len() as _, serializer);
|
||||||
|
for item in self {
|
||||||
|
<crate::api::meow::ConversationView>::sse_encode(item, serializer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SseEncode for Vec<Vec<u8>> {
|
impl SseEncode for Vec<Vec<u8>> {
|
||||||
// Codec=Sse (Serialization based), see doc to use other codecs
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
||||||
@@ -2561,6 +2679,16 @@ impl SseEncode for Option<i64> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl SseEncode for Option<crate::api::meow::MessageView> {
|
||||||
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
|
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
||||||
|
<bool>::sse_encode(self.is_some(), serializer);
|
||||||
|
if let Some(value) = self {
|
||||||
|
<crate::api::meow::MessageView>::sse_encode(value, serializer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SseEncode for Option<u32> {
|
impl SseEncode for Option<u32> {
|
||||||
// Codec=Sse (Serialization based), see doc to use other codecs
|
// Codec=Sse (Serialization based), see doc to use other codecs
|
||||||
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
|
||||||
|
|||||||
Reference in new issue
Block a user