187 lines
6.0 KiB
Rust
Raw Normal View History

2022-01-20 23:51:11 +08:00
use crate::RevisionManager;
use bytes::Bytes;
2022-03-19 16:52:28 +08:00
use flowy_error::{FlowyError, FlowyResult};
use flowy_sync::{
2022-01-20 23:51:11 +08:00
entities::{
revision::{RepeatedRevision, Revision, RevisionRange},
2022-01-21 21:41:24 +08:00
ws_data::ServerRevisionWSDataType,
2022-01-20 23:51:11 +08:00
},
util::make_delta_from_revisions,
};
use lib_infra::future::BoxResultFuture;
2022-02-28 22:38:53 +08:00
use lib_ot::core::{Attributes, Delta, PlainTextAttributes};
use lib_ot::rich_text::RichTextAttributes;
2022-01-20 23:51:11 +08:00
use serde::de::DeserializeOwned;
use std::{convert::TryFrom, sync::Arc};
pub type DeltaMD5 = String;
2022-02-25 22:27:44 +08:00
pub trait ConflictResolver<T>
2022-01-20 23:51:11 +08:00
where
T: Attributes + Send + Sync,
{
fn compose_delta(&self, delta: Delta<T>) -> BoxResultFuture<DeltaMD5, FlowyError>;
fn transform_delta(&self, delta: Delta<T>) -> BoxResultFuture<TransformDeltas<T>, FlowyError>;
fn reset_delta(&self, delta: Delta<T>) -> BoxResultFuture<DeltaMD5, FlowyError>;
}
2022-02-25 22:27:44 +08:00
pub trait ConflictRevisionSink: Send + Sync + 'static {
2022-01-20 23:51:11 +08:00
fn send(&self, revisions: Vec<Revision>) -> BoxResultFuture<(), FlowyError>;
fn ack(&self, rev_id: String, ty: ServerRevisionWSDataType) -> BoxResultFuture<(), FlowyError>;
}
2022-02-28 22:38:53 +08:00
pub type RichTextConflictController = ConflictController<RichTextAttributes>;
pub type PlainTextConflictController = ConflictController<PlainTextAttributes>;
2022-02-25 22:27:44 +08:00
pub struct ConflictController<T>
2022-01-20 23:51:11 +08:00
where
T: Attributes + Send + Sync,
{
user_id: String,
2022-02-25 22:27:44 +08:00
resolver: Arc<dyn ConflictResolver<T> + Send + Sync>,
rev_sink: Arc<dyn ConflictRevisionSink>,
2022-01-20 23:51:11 +08:00
rev_manager: Arc<RevisionManager>,
}
2022-02-25 22:27:44 +08:00
impl<T> ConflictController<T>
2022-01-20 23:51:11 +08:00
where
2022-01-21 21:41:24 +08:00
T: Attributes + Send + Sync + DeserializeOwned + serde::Serialize,
2022-01-20 23:51:11 +08:00
{
pub fn new(
user_id: &str,
2022-02-25 22:27:44 +08:00
resolver: Arc<dyn ConflictResolver<T> + Send + Sync>,
rev_sink: Arc<dyn ConflictRevisionSink>,
2022-01-20 23:51:11 +08:00
rev_manager: Arc<RevisionManager>,
) -> Self {
let user_id = user_id.to_owned();
Self {
user_id,
2022-02-25 22:27:44 +08:00
resolver,
2022-01-20 23:51:11 +08:00
rev_sink,
rev_manager,
}
}
pub async fn receive_bytes(&self, bytes: Bytes) -> FlowyResult<()> {
let repeated_revision = RepeatedRevision::try_from(bytes)?;
if repeated_revision.is_empty() {
return Ok(());
}
2022-01-21 21:41:24 +08:00
match self.handle_revision(repeated_revision).await? {
2022-01-24 17:35:58 +08:00
None => {}
2022-01-21 21:41:24 +08:00
Some(server_revision) => {
self.rev_sink.send(vec![server_revision]).await?;
2022-01-24 17:35:58 +08:00
}
2022-01-21 21:41:24 +08:00
}
2022-01-20 23:51:11 +08:00
Ok(())
}
pub async fn ack_revision(&self, rev_id: String, ty: ServerRevisionWSDataType) -> FlowyResult<()> {
2022-01-21 21:41:24 +08:00
let _ = self.rev_sink.ack(rev_id, ty).await?;
Ok(())
2022-01-20 23:51:11 +08:00
}
pub async fn send_revisions(&self, range: RevisionRange) -> FlowyResult<()> {
let revisions = self.rev_manager.get_revisions_in_range(range).await?;
2022-01-21 21:41:24 +08:00
let _ = self.rev_sink.send(revisions).await?;
2022-01-20 23:51:11 +08:00
Ok(())
}
2022-01-21 21:41:24 +08:00
async fn handle_revision(&self, repeated_revision: RepeatedRevision) -> FlowyResult<Option<Revision>> {
let mut revisions = repeated_revision.into_inner();
let first_revision = revisions.first().unwrap();
if let Some(local_revision) = self.rev_manager.get_revision(first_revision.rev_id).await {
if local_revision.md5 == first_revision.md5 {
// The local revision is equal to the pushed revision. Just ignore it.
revisions = revisions.split_off(1);
if revisions.is_empty() {
return Ok(None);
}
} else {
return Ok(None);
}
}
let new_delta = make_delta_from_revisions(revisions.clone())?;
let TransformDeltas {
client_prime,
server_prime,
2022-02-25 22:27:44 +08:00
} = self.resolver.transform_delta(new_delta).await?;
2022-01-21 21:41:24 +08:00
match server_prime {
None => {
// The server_prime is None means the client local revisions conflict with the
// // server, and it needs to override the client delta.
2022-02-25 22:27:44 +08:00
let md5 = self.resolver.reset_delta(client_prime).await?;
2022-01-21 21:41:24 +08:00
let repeated_revision = RepeatedRevision::new(revisions);
assert_eq!(repeated_revision.last().unwrap().md5, md5);
let _ = self.rev_manager.reset_object(repeated_revision).await?;
Ok(None)
2022-01-24 17:35:58 +08:00
}
2022-01-21 21:41:24 +08:00
Some(server_prime) => {
2022-02-25 22:27:44 +08:00
let md5 = self.resolver.compose_delta(client_prime.clone()).await?;
2022-01-21 21:41:24 +08:00
for revision in &revisions {
let _ = self.rev_manager.add_remote_revision(revision).await?;
}
let (client_revision, server_revision) = make_client_and_server_revision(
&self.user_id,
&self.rev_manager,
client_prime,
Some(server_prime),
md5,
);
let _ = self.rev_manager.add_remote_revision(&client_revision).await?;
Ok(server_revision)
2022-01-24 17:35:58 +08:00
}
2022-01-21 21:41:24 +08:00
}
}
2022-01-20 23:51:11 +08:00
}
fn make_client_and_server_revision<T>(
user_id: &str,
rev_manager: &Arc<RevisionManager>,
client_delta: Delta<T>,
server_delta: Option<Delta<T>>,
md5: String,
) -> (Revision, Option<Revision>)
where
T: Attributes + serde::Serialize,
{
let (base_rev_id, rev_id) = rev_manager.next_rev_id_pair();
let client_revision = Revision::new(
&rev_manager.object_id,
base_rev_id,
rev_id,
2022-03-15 19:00:28 +08:00
client_delta.to_delta_bytes(),
2022-01-24 17:35:58 +08:00
user_id,
2022-01-20 23:51:11 +08:00
md5.clone(),
);
match server_delta {
None => (client_revision, None),
Some(server_delta) => {
let server_revision = Revision::new(
&rev_manager.object_id,
base_rev_id,
rev_id,
2022-03-15 19:00:28 +08:00
server_delta.to_delta_bytes(),
2022-01-24 17:35:58 +08:00
user_id,
2022-01-20 23:51:11 +08:00
md5,
);
(client_revision, Some(server_revision))
2022-01-24 17:35:58 +08:00
}
2022-01-20 23:51:11 +08:00
}
}
2022-02-28 22:38:53 +08:00
pub type RichTextTransformDeltas = TransformDeltas<RichTextAttributes>;
2022-01-20 23:51:11 +08:00
pub struct TransformDeltas<T>
where
T: Attributes,
{
pub client_prime: Delta<T>,
pub server_prime: Option<Delta<T>>,
}