123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182 |
- use crate::RevisionManager;
- use bytes::Bytes;
- use flowy_collaboration::{
- entities::{
- revision::{RepeatedRevision, Revision, RevisionRange},
- ws_data::{ClientRevisionWSData, ServerRevisionWSDataType},
- },
- util::make_delta_from_revisions,
- };
- use flowy_error::{FlowyError, FlowyResult};
- use lib_infra::future::BoxResultFuture;
- use lib_ot::core::{Attributes, Delta};
- use serde::de::DeserializeOwned;
- use std::{convert::TryFrom, sync::Arc};
- use tokio::sync::oneshot;
- pub type DeltaMD5 = String;
- pub trait ResolverTarget<T>
- 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>;
- }
- pub trait ResolverRevisionSink: Send + Sync {
- fn send(&self, revisions: Vec<Revision>) -> BoxResultFuture<(), FlowyError>;
- fn ack(&self, rev_id: String, ty: ServerRevisionWSDataType) -> BoxResultFuture<(), FlowyError>;
- }
- pub struct RevisionConflictResolver<T>
- where
- T: Attributes + Send + Sync,
- {
- user_id: String,
- target: Arc<dyn ResolverTarget<T>>,
- rev_sink: Arc<dyn ResolverRevisionSink>,
- rev_manager: Arc<RevisionManager>,
- }
- impl<T> RevisionConflictResolver<T>
- where
- T: Attributes + Send + Sync,
- // DeserializeOwned + serde::Serialize,
- {
- pub fn new(
- user_id: &str,
- target: Arc<dyn ResolverTarget<T>>,
- rev_sink: Arc<dyn ResolverRevisionSink>,
- rev_manager: Arc<RevisionManager>,
- ) -> Self {
- let user_id = user_id.to_owned();
- Self {
- user_id,
- target,
- 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(());
- }
- // match self.handle_revision(repeated_revision).await? {
- // None => {},
- // Some(server_revision) => {
- // self.rev_sink.send(vec![server_revision]);
- // },
- // }
- Ok(())
- }
- pub async fn ack_revision(&self, rev_id: String, ty: ServerRevisionWSDataType) -> FlowyResult<()> {
- self.rev_sink.ack(rev_id, ty).await
- }
- pub async fn send_revisions(&self, range: RevisionRange) -> FlowyResult<()> {
- let revisions = self.rev_manager.get_revisions_in_range(range).await?;
- self.rev_sink.send(revisions).await;
- Ok(())
- }
- // 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,
- // } = self.target.transform_delta(new_delta).await?;
- //
- // 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. let md5 =
- // self.target.reset_delta(client_prime).await?; 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) },
- // Some(server_prime) => {
- // let md5 = self.target.compose_delta(client_prime.clone()).await?;
- // 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)
- // },
- // }
- // }
- }
- 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,
- client_delta.to_bytes(),
- &user_id,
- 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,
- server_delta.to_bytes(),
- &user_id,
- md5,
- );
- (client_revision, Some(server_revision))
- },
- }
- }
- pub struct TransformDeltas<T>
- where
- T: Attributes,
- {
- pub client_prime: Delta<T>,
- pub server_prime: Option<Delta<T>>,
- }
|