2021-12-16 21:31:36 +08:00
|
|
|
use crate::{errors::FlowyError, module::DocumentUser, services::doc::*};
|
2021-10-01 19:39:08 +08:00
|
|
|
use bytes::Bytes;
|
2021-12-11 13:47:16 +08:00
|
|
|
use flowy_collaboration::{
|
|
|
|
core::document::history::UndoResult,
|
2021-12-18 18:35:45 +08:00
|
|
|
entities::{
|
|
|
|
doc::DocDelta,
|
2021-12-19 21:10:50 +08:00
|
|
|
ws::{DocumentWSData, DocumentWSDataBuilder, DocumentWSDataType, NewDocumentUser},
|
2021-12-18 18:35:45 +08:00
|
|
|
},
|
2021-12-12 12:41:16 +08:00
|
|
|
errors::CollaborateResult,
|
2021-11-19 12:18:46 +08:00
|
|
|
};
|
2021-12-11 13:47:16 +08:00
|
|
|
use flowy_database::ConnectionPool;
|
2021-12-14 18:04:51 +08:00
|
|
|
use flowy_error::{internal_error, FlowyResult};
|
2021-12-16 21:31:36 +08:00
|
|
|
use lib_infra::future::FutureResult;
|
2021-12-07 19:59:08 +08:00
|
|
|
use lib_ot::{
|
|
|
|
core::Interval,
|
2021-12-16 21:31:36 +08:00
|
|
|
revision::{RevId, RevType, Revision, RevisionRange},
|
2021-12-07 19:59:08 +08:00
|
|
|
rich_text::{RichTextAttribute, RichTextDelta},
|
|
|
|
};
|
2021-12-18 18:35:45 +08:00
|
|
|
use lib_ws::WSConnectState;
|
2021-12-16 22:24:05 +08:00
|
|
|
use std::{collections::VecDeque, sync::Arc};
|
2021-12-18 18:35:45 +08:00
|
|
|
use tokio::sync::{broadcast, mpsc, mpsc::UnboundedSender, oneshot, RwLock};
|
2021-12-18 00:23:26 +08:00
|
|
|
|
2021-12-03 22:40:56 +08:00
|
|
|
pub struct ClientDocEditor {
|
2021-12-16 22:24:05 +08:00
|
|
|
pub doc_id: String,
|
2021-10-01 19:39:08 +08:00
|
|
|
rev_manager: Arc<RevisionManager>,
|
2021-12-18 18:35:45 +08:00
|
|
|
editor_ws: Arc<EditorWebSocket>,
|
|
|
|
editor_cmd_sender: UnboundedSender<EditorCommand>,
|
2021-10-04 17:38:56 +08:00
|
|
|
user: Arc<dyn DocumentUser>,
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-03 22:40:56 +08:00
|
|
|
impl ClientDocEditor {
|
2021-10-01 19:39:08 +08:00
|
|
|
pub(crate) async fn new(
|
2021-10-02 17:19:54 +08:00
|
|
|
doc_id: &str,
|
2021-10-03 11:33:19 +08:00
|
|
|
user: Arc<dyn DocumentUser>,
|
2021-12-08 21:51:06 +08:00
|
|
|
pool: Arc<ConnectionPool>,
|
|
|
|
mut rev_manager: RevisionManager,
|
2021-12-16 21:31:36 +08:00
|
|
|
ws: Arc<dyn DocumentWebSocket>,
|
2021-12-18 00:23:26 +08:00
|
|
|
server: Arc<dyn RevisionServer>,
|
2021-12-14 18:04:51 +08:00
|
|
|
) -> FlowyResult<Arc<Self>> {
|
2021-12-18 00:23:26 +08:00
|
|
|
let delta = rev_manager.load_document(server).await?;
|
2021-12-18 18:35:45 +08:00
|
|
|
let editor_cmd_sender = spawn_edit_queue(doc_id, delta, pool.clone());
|
2021-10-03 11:33:19 +08:00
|
|
|
let doc_id = doc_id.to_string();
|
2021-12-18 18:35:45 +08:00
|
|
|
let user_id = user.user_id()?;
|
2021-10-07 20:46:29 +08:00
|
|
|
let rev_manager = Arc::new(rev_manager);
|
2021-12-19 21:10:50 +08:00
|
|
|
let combined_sink = Arc::new(CombinedSink::new(rev_manager.clone()));
|
|
|
|
let ws_stream_consumer = Arc::new(DocumentWebSocketSteamConsumerAdapter {
|
2021-12-16 21:31:36 +08:00
|
|
|
doc_id: doc_id.clone(),
|
2021-12-18 18:35:45 +08:00
|
|
|
editor_cmd_sender: editor_cmd_sender.clone(),
|
2021-12-16 21:31:36 +08:00
|
|
|
rev_manager: rev_manager.clone(),
|
|
|
|
user: user.clone(),
|
2021-12-19 21:10:50 +08:00
|
|
|
combined_sink: combined_sink.clone(),
|
2021-12-16 21:31:36 +08:00
|
|
|
});
|
2021-12-19 21:10:50 +08:00
|
|
|
let ws_stream_provider = Arc::new(DocumentWSSinkDataProviderAdapter(combined_sink.clone()));
|
|
|
|
let editor_ws = Arc::new(EditorWebSocket::new(
|
|
|
|
&doc_id,
|
|
|
|
ws,
|
|
|
|
ws_stream_provider,
|
|
|
|
ws_stream_consumer,
|
|
|
|
));
|
2021-12-18 18:35:45 +08:00
|
|
|
|
2021-12-19 21:10:50 +08:00
|
|
|
//
|
|
|
|
notify_user_conn(&user_id, &doc_id, rev_manager.clone(), combined_sink.clone()).await;
|
|
|
|
|
|
|
|
//
|
2021-12-18 18:35:45 +08:00
|
|
|
listen_document_ws_state(
|
|
|
|
&user_id,
|
|
|
|
&doc_id,
|
|
|
|
editor_ws.scribe_state(),
|
|
|
|
rev_manager.clone(),
|
2021-12-19 21:10:50 +08:00
|
|
|
combined_sink,
|
2021-12-18 18:35:45 +08:00
|
|
|
);
|
|
|
|
|
2021-12-16 21:31:36 +08:00
|
|
|
let editor = Arc::new(Self {
|
2021-10-03 11:33:19 +08:00
|
|
|
doc_id,
|
2021-10-01 19:39:08 +08:00
|
|
|
rev_manager,
|
2021-12-18 18:35:45 +08:00
|
|
|
editor_ws,
|
|
|
|
editor_cmd_sender,
|
2021-10-04 17:38:56 +08:00
|
|
|
user,
|
2021-12-08 21:51:06 +08:00
|
|
|
});
|
2021-12-16 21:31:36 +08:00
|
|
|
Ok(editor)
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn insert<T: ToString>(&self, index: usize, data: T) -> Result<(), FlowyError> {
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<NewDelta>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::Insert {
|
2021-10-01 19:39:08 +08:00
|
|
|
index,
|
|
|
|
data: data.to_string(),
|
|
|
|
ret,
|
|
|
|
};
|
2021-12-18 18:35:45 +08:00
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-15 23:01:50 +08:00
|
|
|
let (delta, md5) = rx.await.map_err(internal_error)??;
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
2021-11-12 21:44:26 +08:00
|
|
|
Ok(())
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn delete(&self, interval: Interval) -> Result<(), FlowyError> {
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<NewDelta>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::Delete { interval, ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-15 23:01:50 +08:00
|
|
|
let (delta, md5) = rx.await.map_err(internal_error)??;
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
2021-10-01 19:39:08 +08:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn format(&self, interval: Interval, attribute: RichTextAttribute) -> Result<(), FlowyError> {
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<NewDelta>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::Format {
|
2021-10-01 19:39:08 +08:00
|
|
|
interval,
|
|
|
|
attribute,
|
|
|
|
ret,
|
|
|
|
};
|
2021-12-18 18:35:45 +08:00
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-15 23:01:50 +08:00
|
|
|
let (delta, md5) = rx.await.map_err(internal_error)??;
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
2021-10-01 19:39:08 +08:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn replace<T: ToString>(&self, interval: Interval, data: T) -> Result<(), FlowyError> {
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<NewDelta>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::Replace {
|
2021-10-01 19:39:08 +08:00
|
|
|
interval,
|
|
|
|
data: data.to_string(),
|
|
|
|
ret,
|
|
|
|
};
|
2021-12-18 18:35:45 +08:00
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-15 23:01:50 +08:00
|
|
|
let (delta, md5) = rx.await.map_err(internal_error)??;
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
2021-10-01 19:39:08 +08:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
pub async fn can_undo(&self) -> bool {
|
|
|
|
let (ret, rx) = oneshot::channel::<bool>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::CanUndo { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-10-01 19:39:08 +08:00
|
|
|
rx.await.unwrap_or(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub async fn can_redo(&self) -> bool {
|
|
|
|
let (ret, rx) = oneshot::channel::<bool>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::CanRedo { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-10-01 19:39:08 +08:00
|
|
|
rx.await.unwrap_or(false)
|
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn undo(&self) -> Result<UndoResult, FlowyError> {
|
2021-12-12 12:41:16 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<UndoResult>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::Undo { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-11-19 12:18:46 +08:00
|
|
|
let r = rx.await.map_err(internal_error)??;
|
|
|
|
Ok(r)
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn redo(&self) -> Result<UndoResult, FlowyError> {
|
2021-12-12 12:41:16 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<UndoResult>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::Redo { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-11-19 12:18:46 +08:00
|
|
|
let r = rx.await.map_err(internal_error)??;
|
|
|
|
Ok(r)
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn delta(&self) -> FlowyResult<DocDelta> {
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<DocumentMD5>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::ReadDoc { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-10-01 19:39:08 +08:00
|
|
|
let data = rx.await.map_err(internal_error)??;
|
|
|
|
|
2021-10-06 15:23:38 +08:00
|
|
|
Ok(DocDelta {
|
|
|
|
doc_id: self.doc_id.clone(),
|
|
|
|
data,
|
|
|
|
})
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-15 23:01:50 +08:00
|
|
|
async fn save_local_delta(&self, delta: RichTextDelta, md5: String) -> Result<RevId, FlowyError> {
|
2021-10-06 23:21:57 +08:00
|
|
|
let delta_data = delta.to_bytes();
|
2021-10-01 19:39:08 +08:00
|
|
|
let (base_rev_id, rev_id) = self.rev_manager.next_rev_id();
|
2021-12-09 22:28:11 +08:00
|
|
|
let user_id = self.user.user_id()?;
|
2021-12-15 23:01:50 +08:00
|
|
|
let revision = Revision::new(
|
|
|
|
&self.doc_id,
|
|
|
|
base_rev_id,
|
|
|
|
rev_id,
|
|
|
|
delta_data,
|
|
|
|
RevType::Local,
|
|
|
|
&user_id,
|
|
|
|
md5,
|
|
|
|
);
|
2021-12-13 22:46:35 +08:00
|
|
|
let _ = self.rev_manager.add_local_revision(&revision).await?;
|
2021-10-02 21:35:06 +08:00
|
|
|
Ok(rev_id.into())
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#[tracing::instrument(level = "debug", skip(self, data), err)]
|
2021-12-14 18:04:51 +08:00
|
|
|
pub(crate) async fn composing_local_delta(&self, data: Bytes) -> Result<(), FlowyError> {
|
2021-12-07 10:39:01 +08:00
|
|
|
let delta = RichTextDelta::from_bytes(&data)?;
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<DocumentMD5>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::ComposeDelta {
|
2021-10-06 23:21:57 +08:00
|
|
|
delta: delta.clone(),
|
|
|
|
ret,
|
|
|
|
};
|
2021-12-18 18:35:45 +08:00
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-15 23:01:50 +08:00
|
|
|
let md5 = rx.await.map_err(internal_error)??;
|
2021-10-01 19:39:08 +08:00
|
|
|
|
2021-12-15 23:01:50 +08:00
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
2021-11-12 21:44:26 +08:00
|
|
|
Ok(())
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-09 19:01:58 +08:00
|
|
|
#[tracing::instrument(level = "debug", skip(self))]
|
2021-12-18 18:35:45 +08:00
|
|
|
pub fn stop_sync(&self) { self.editor_ws.stop(); }
|
2021-12-09 11:00:05 +08:00
|
|
|
|
2021-12-18 18:35:45 +08:00
|
|
|
pub(crate) fn ws_handler(&self) -> Arc<dyn DocumentWsHandler> { self.editor_ws.clone() }
|
2021-12-16 21:31:36 +08:00
|
|
|
}
|
2021-10-04 17:38:56 +08:00
|
|
|
|
2021-12-18 18:35:45 +08:00
|
|
|
fn spawn_edit_queue(doc_id: &str, delta: RichTextDelta, _pool: Arc<ConnectionPool>) -> UnboundedSender<EditorCommand> {
|
|
|
|
let (sender, receiver) = mpsc::unbounded_channel::<EditorCommand>();
|
|
|
|
let actor = EditorCommandQueue::new(doc_id, delta, receiver);
|
2021-12-16 21:31:36 +08:00
|
|
|
tokio::spawn(actor.run());
|
|
|
|
sender
|
|
|
|
}
|
2021-10-04 17:38:56 +08:00
|
|
|
|
2021-12-18 18:35:45 +08:00
|
|
|
fn listen_document_ws_state(
|
|
|
|
user_id: &str,
|
|
|
|
doc_id: &str,
|
|
|
|
mut subscriber: broadcast::Receiver<WSConnectState>,
|
|
|
|
rev_manager: Arc<RevisionManager>,
|
2021-12-19 21:10:50 +08:00
|
|
|
sink_data_provider: Arc<CombinedSink>,
|
2021-12-18 18:35:45 +08:00
|
|
|
) {
|
|
|
|
let user_id = user_id.to_owned();
|
|
|
|
let doc_id = doc_id.to_owned();
|
|
|
|
|
|
|
|
tokio::spawn(async move {
|
|
|
|
while let Ok(state) = subscriber.recv().await {
|
|
|
|
match state {
|
|
|
|
WSConnectState::Init => {},
|
|
|
|
WSConnectState::Connecting => {},
|
|
|
|
WSConnectState::Connected => {
|
|
|
|
// self.notify_user_conn()
|
|
|
|
notify_user_conn(&user_id, &doc_id, rev_manager.clone(), sink_data_provider.clone()).await;
|
|
|
|
},
|
|
|
|
WSConnectState::Disconnected => {},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2021-12-19 21:10:50 +08:00
|
|
|
async fn notify_user_conn(
|
|
|
|
user_id: &str,
|
|
|
|
doc_id: &str,
|
|
|
|
rev_manager: Arc<RevisionManager>,
|
|
|
|
combined_sink: Arc<CombinedSink>,
|
|
|
|
) {
|
|
|
|
let need_notify = match combined_sink.front().await {
|
|
|
|
None => true,
|
|
|
|
Some(data) => data.ty != DocumentWSDataType::UserConnect,
|
|
|
|
};
|
|
|
|
|
|
|
|
if need_notify {
|
|
|
|
let new_connect = NewDocumentUser {
|
|
|
|
user_id: user_id.to_owned(),
|
|
|
|
doc_id: doc_id.to_owned(),
|
|
|
|
rev_id: rev_manager.latest_rev_id(),
|
|
|
|
};
|
|
|
|
|
|
|
|
let data = DocumentWSDataBuilder::build_new_document_user_message(doc_id, new_connect);
|
|
|
|
combined_sink.push_front(data).await;
|
|
|
|
}
|
|
|
|
}
|
2021-12-18 00:23:26 +08:00
|
|
|
|
2021-12-19 21:10:50 +08:00
|
|
|
struct DocumentWebSocketSteamConsumerAdapter {
|
|
|
|
doc_id: String,
|
|
|
|
editor_cmd_sender: UnboundedSender<EditorCommand>,
|
2021-12-16 21:31:36 +08:00
|
|
|
rev_manager: Arc<RevisionManager>,
|
2021-12-19 21:10:50 +08:00
|
|
|
user: Arc<dyn DocumentUser>,
|
|
|
|
combined_sink: Arc<CombinedSink>,
|
2021-12-04 17:31:32 +08:00
|
|
|
}
|
|
|
|
|
2021-12-19 21:10:50 +08:00
|
|
|
impl DocumentWSSteamConsumer for DocumentWebSocketSteamConsumerAdapter {
|
|
|
|
fn receive_push_revision(&self, bytes: Bytes) -> FutureResult<(), FlowyError> {
|
|
|
|
let user = self.user.clone();
|
2021-12-16 21:31:36 +08:00
|
|
|
let rev_manager = self.rev_manager.clone();
|
2021-12-19 21:10:50 +08:00
|
|
|
let edit_cmd_tx = self.editor_cmd_sender.clone();
|
|
|
|
let combined_sink = self.combined_sink.clone();
|
|
|
|
let doc_id = self.doc_id.clone();
|
2021-12-16 21:31:36 +08:00
|
|
|
FutureResult::new(async move {
|
2021-12-19 21:10:50 +08:00
|
|
|
let user_id = user.user_id()?;
|
|
|
|
if let Some(revision) = handle_push_rev(&doc_id, &user_id, edit_cmd_tx, rev_manager, bytes).await? {
|
|
|
|
combined_sink.push_back(revision.into()).await;
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
2021-12-19 21:10:50 +08:00
|
|
|
Ok(())
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
fn receive_ack(&self, id: String, ty: DocumentWSDataType) -> FutureResult<(), FlowyError> {
|
|
|
|
let combined_sink = self.combined_sink.clone();
|
|
|
|
FutureResult::new(async move { combined_sink.ack(id, ty).await })
|
|
|
|
}
|
|
|
|
|
|
|
|
fn receive_new_user_connect(&self, _new_user: NewDocumentUser) -> FutureResult<(), FlowyError> {
|
|
|
|
FutureResult::new(async move { Ok(()) })
|
|
|
|
}
|
|
|
|
|
|
|
|
fn send_revision_in_range(&self, range: RevisionRange) -> FutureResult<(), FlowyError> {
|
|
|
|
let rev_manager = self.rev_manager.clone();
|
|
|
|
let combined_sink = self.combined_sink.clone();
|
|
|
|
FutureResult::new(async move {
|
|
|
|
let revision = rev_manager.mk_revisions(range).await?;
|
|
|
|
combined_sink.push_back(revision.into()).await;
|
|
|
|
Ok(())
|
2021-12-16 21:31:36 +08:00
|
|
|
})
|
2021-10-04 17:38:56 +08:00
|
|
|
}
|
2021-10-01 19:39:08 +08:00
|
|
|
}
|
|
|
|
|
2021-12-19 21:10:50 +08:00
|
|
|
struct DocumentWSSinkDataProviderAdapter(Arc<CombinedSink>);
|
|
|
|
impl DocumentWSSinkDataProvider for DocumentWSSinkDataProviderAdapter {
|
|
|
|
fn next(&self) -> FutureResult<Option<DocumentWSData>, FlowyError> {
|
|
|
|
let combined_sink = self.0.clone();
|
|
|
|
FutureResult::new(async move { combined_sink.next().await })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-16 21:31:36 +08:00
|
|
|
#[tracing::instrument(level = "debug", skip(edit_cmd_tx, rev_manager, bytes))]
|
|
|
|
pub(crate) async fn handle_push_rev(
|
|
|
|
doc_id: &str,
|
|
|
|
user_id: &str,
|
2021-12-18 18:35:45 +08:00
|
|
|
edit_cmd_tx: UnboundedSender<EditorCommand>,
|
2021-12-16 21:31:36 +08:00
|
|
|
rev_manager: Arc<RevisionManager>,
|
|
|
|
bytes: Bytes,
|
|
|
|
) -> FlowyResult<Option<Revision>> {
|
|
|
|
// Transform the revision
|
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<TransformDeltas>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let _ = edit_cmd_tx.send(EditorCommand::ProcessRemoteRevision { bytes, ret });
|
2021-12-16 21:31:36 +08:00
|
|
|
let TransformDeltas {
|
|
|
|
client_prime,
|
|
|
|
server_prime,
|
|
|
|
server_rev_id,
|
|
|
|
} = rx.await.map_err(internal_error)??;
|
|
|
|
|
|
|
|
if rev_manager.rev_id() >= server_rev_id.value {
|
|
|
|
// Ignore this push revision if local_rev_id >= server_rev_id
|
|
|
|
return Ok(None);
|
|
|
|
}
|
2021-12-08 21:51:06 +08:00
|
|
|
|
2021-12-16 21:31:36 +08:00
|
|
|
// compose delta
|
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<DocumentMD5>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::ComposeDelta {
|
2021-12-16 21:31:36 +08:00
|
|
|
delta: client_prime.clone(),
|
|
|
|
ret,
|
|
|
|
};
|
|
|
|
let _ = edit_cmd_tx.send(msg);
|
|
|
|
let md5 = rx.await.map_err(internal_error)??;
|
|
|
|
|
|
|
|
// update rev id
|
|
|
|
rev_manager.update_rev_id_counter_value(server_rev_id.clone().into());
|
|
|
|
let (local_base_rev_id, local_rev_id) = rev_manager.next_rev_id();
|
|
|
|
let delta_data = client_prime.to_bytes();
|
|
|
|
// save the revision
|
|
|
|
let revision = Revision::new(
|
|
|
|
&doc_id,
|
|
|
|
local_base_rev_id,
|
|
|
|
local_rev_id,
|
|
|
|
delta_data,
|
|
|
|
RevType::Remote,
|
|
|
|
&user_id,
|
|
|
|
md5.clone(),
|
|
|
|
);
|
|
|
|
|
|
|
|
let _ = rev_manager.add_remote_revision(&revision).await?;
|
|
|
|
|
|
|
|
// send the server_prime delta
|
|
|
|
let delta_data = server_prime.to_bytes();
|
|
|
|
Ok(Some(Revision::new(
|
|
|
|
&doc_id,
|
|
|
|
local_base_rev_id,
|
|
|
|
local_rev_id,
|
|
|
|
delta_data,
|
|
|
|
RevType::Remote,
|
|
|
|
&user_id,
|
|
|
|
md5,
|
|
|
|
)))
|
2021-12-08 21:51:06 +08:00
|
|
|
}
|
2021-12-09 11:00:05 +08:00
|
|
|
|
2021-12-19 21:10:50 +08:00
|
|
|
#[derive(Clone)]
|
|
|
|
enum SourceType {
|
|
|
|
Shared,
|
|
|
|
Revision,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
struct CombinedSink {
|
|
|
|
shared: Arc<RwLock<VecDeque<DocumentWSData>>>,
|
|
|
|
rev_manager: Arc<RevisionManager>,
|
|
|
|
source_ty: Arc<RwLock<SourceType>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CombinedSink {
|
|
|
|
fn new(rev_manager: Arc<RevisionManager>) -> Self {
|
|
|
|
CombinedSink {
|
|
|
|
shared: Arc::new(RwLock::new(VecDeque::new())),
|
|
|
|
rev_manager,
|
|
|
|
source_ty: Arc::new(RwLock::new(SourceType::Shared)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME: return Option<&DocumentWSData> would be better
|
|
|
|
async fn front(&self) -> Option<DocumentWSData> { self.shared.read().await.front().cloned() }
|
|
|
|
|
|
|
|
async fn push_front(&self, data: DocumentWSData) { self.shared.write().await.push_front(data); }
|
|
|
|
|
|
|
|
async fn push_back(&self, data: DocumentWSData) { self.shared.write().await.push_back(data); }
|
|
|
|
|
|
|
|
async fn next(&self) -> FlowyResult<Option<DocumentWSData>> {
|
|
|
|
let source_ty = self.source_ty.read().await.clone();
|
|
|
|
match source_ty {
|
|
|
|
SourceType::Shared => match self.shared.read().await.front() {
|
|
|
|
None => {
|
|
|
|
*self.source_ty.write().await = SourceType::Revision;
|
|
|
|
Ok(None)
|
|
|
|
},
|
|
|
|
Some(data) => {
|
|
|
|
tracing::debug!("[DocumentSinkDataProvider]: {}:{:?}", data.doc_id, data.ty);
|
|
|
|
Ok(Some(data.clone()))
|
|
|
|
},
|
|
|
|
},
|
|
|
|
SourceType::Revision => {
|
|
|
|
if !self.shared.read().await.is_empty() {
|
|
|
|
*self.source_ty.write().await = SourceType::Shared;
|
|
|
|
return Ok(None);
|
|
|
|
}
|
|
|
|
|
|
|
|
match self.rev_manager.next_sync_revision().await? {
|
|
|
|
Some(rev) => {
|
|
|
|
tracing::debug!("[DocumentSinkDataProvider]: {}:{:?}", rev.doc_id, rev.rev_id);
|
|
|
|
Ok(Some(rev.into()))
|
|
|
|
},
|
|
|
|
None => Ok(None),
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn ack(&self, id: String, _ty: DocumentWSDataType) -> FlowyResult<()> {
|
|
|
|
// let _ = self.rev_manager.ack_revision(id).await?;
|
|
|
|
let source_ty = self.source_ty.read().await.clone();
|
|
|
|
match source_ty {
|
|
|
|
SourceType::Shared => {
|
|
|
|
let should_pop = match self.shared.read().await.front() {
|
|
|
|
None => false,
|
|
|
|
Some(val) => {
|
|
|
|
if val.id == id {
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
tracing::error!("The front element's {} is not equal to the {}", val.id, id);
|
|
|
|
false
|
|
|
|
}
|
|
|
|
},
|
|
|
|
};
|
|
|
|
if should_pop {
|
|
|
|
let _ = self.shared.write().await.pop_front();
|
|
|
|
}
|
|
|
|
},
|
|
|
|
SourceType::Revision => {
|
|
|
|
match id.parse::<i64>() {
|
|
|
|
Ok(rev_id) => {
|
|
|
|
let _ = self.rev_manager.ack_revision(rev_id).await?;
|
|
|
|
},
|
|
|
|
Err(e) => {
|
|
|
|
tracing::error!("Parse rev_id from {} failed. {}", id, e);
|
|
|
|
},
|
|
|
|
};
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-09 11:00:05 +08:00
|
|
|
#[cfg(feature = "flowy_unit_test")]
|
|
|
|
impl ClientDocEditor {
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn doc_json(&self) -> FlowyResult<String> {
|
2021-12-15 23:01:50 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<DocumentMD5>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::ReadDoc { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-09 11:00:05 +08:00
|
|
|
let s = rx.await.map_err(internal_error)??;
|
|
|
|
Ok(s)
|
|
|
|
}
|
|
|
|
|
2021-12-14 18:04:51 +08:00
|
|
|
pub async fn doc_delta(&self) -> FlowyResult<RichTextDelta> {
|
2021-12-12 12:41:16 +08:00
|
|
|
let (ret, rx) = oneshot::channel::<CollaborateResult<RichTextDelta>>();
|
2021-12-18 18:35:45 +08:00
|
|
|
let msg = EditorCommand::ReadDocDelta { ret };
|
|
|
|
let _ = self.editor_cmd_sender.send(msg);
|
2021-12-09 11:00:05 +08:00
|
|
|
let delta = rx.await.map_err(internal_error)??;
|
|
|
|
Ok(delta)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn rev_manager(&self) -> Arc<RevisionManager> { self.rev_manager.clone() }
|
|
|
|
}
|