2022-01-14 15:23:21 +08:00
|
|
|
use crate::{context::DocumentUser, core::web_socket::EditorCommandReceiver};
|
2021-12-16 22:24:05 +08:00
|
|
|
use async_stream::stream;
|
|
|
|
use flowy_collaboration::{
|
2022-01-12 17:08:50 +08:00
|
|
|
client_document::{history::UndoResult, ClientDocument, NewlineDoc},
|
2022-01-05 23:15:55 +08:00
|
|
|
entities::revision::{RepeatedRevision, RevId, Revision},
|
2021-12-16 22:24:05 +08:00
|
|
|
errors::CollaborateError,
|
2022-01-02 22:23:33 +08:00
|
|
|
util::make_delta_from_revisions,
|
2021-12-16 22:24:05 +08:00
|
|
|
};
|
|
|
|
use flowy_error::FlowyError;
|
2022-01-14 15:23:21 +08:00
|
|
|
use flowy_sync::RevisionManager;
|
2021-12-16 22:24:05 +08:00
|
|
|
use futures::stream::StreamExt;
|
|
|
|
use lib_ot::{
|
|
|
|
core::{Interval, OperationTransformable},
|
|
|
|
rich_text::{RichTextAttribute, RichTextDelta},
|
|
|
|
};
|
2022-01-12 15:40:06 +08:00
|
|
|
use std::sync::Arc;
|
2022-01-12 12:40:41 +08:00
|
|
|
use tokio::sync::{oneshot, RwLock};
|
2021-12-16 22:24:05 +08:00
|
|
|
|
2022-01-12 12:40:41 +08:00
|
|
|
// The EditorCommandQueue executes each command that will alter the document in
|
|
|
|
// serial.
|
2021-12-18 18:35:45 +08:00
|
|
|
pub(crate) struct EditorCommandQueue {
|
2022-01-12 17:08:50 +08:00
|
|
|
document: Arc<RwLock<ClientDocument>>,
|
2022-01-05 23:15:55 +08:00
|
|
|
user: Arc<dyn DocumentUser>,
|
2022-01-14 15:23:21 +08:00
|
|
|
rev_manager: Arc<RevisionManager>,
|
2022-01-12 12:40:41 +08:00
|
|
|
receiver: Option<EditorCommandReceiver>,
|
2021-12-16 22:24:05 +08:00
|
|
|
}
|
|
|
|
|
2021-12-18 18:35:45 +08:00
|
|
|
impl EditorCommandQueue {
|
2022-01-05 23:15:55 +08:00
|
|
|
pub(crate) fn new(
|
|
|
|
user: Arc<dyn DocumentUser>,
|
2022-01-14 15:23:21 +08:00
|
|
|
rev_manager: Arc<RevisionManager>,
|
2022-01-05 23:15:55 +08:00
|
|
|
delta: RichTextDelta,
|
2022-01-12 12:40:41 +08:00
|
|
|
receiver: EditorCommandReceiver,
|
2022-01-05 23:15:55 +08:00
|
|
|
) -> Self {
|
2022-01-12 17:08:50 +08:00
|
|
|
let document = Arc::new(RwLock::new(ClientDocument::from_delta(delta)));
|
2021-12-16 22:24:05 +08:00
|
|
|
Self {
|
|
|
|
document,
|
2022-01-05 23:15:55 +08:00
|
|
|
user,
|
|
|
|
rev_manager,
|
2021-12-16 22:24:05 +08:00
|
|
|
receiver: Some(receiver),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) async fn run(mut self) {
|
|
|
|
let mut receiver = self.receiver.take().expect("Should only call once");
|
|
|
|
let stream = stream! {
|
|
|
|
loop {
|
|
|
|
match receiver.recv().await {
|
|
|
|
Some(msg) => yield msg,
|
|
|
|
None => break,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
stream
|
2022-01-05 23:15:55 +08:00
|
|
|
.for_each(|command| async {
|
|
|
|
match self.handle_command(command).await {
|
2021-12-16 22:24:05 +08:00
|
|
|
Ok(_) => {},
|
|
|
|
Err(e) => tracing::debug!("[EditCommandQueue]: {}", e),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.await;
|
|
|
|
}
|
|
|
|
|
2022-01-09 15:13:45 +08:00
|
|
|
#[tracing::instrument(level = "trace", skip(self), err)]
|
2022-01-05 23:15:55 +08:00
|
|
|
async fn handle_command(&self, command: EditorCommand) -> Result<(), FlowyError> {
|
|
|
|
match command {
|
|
|
|
EditorCommand::ComposeLocalDelta { delta, ret } => {
|
|
|
|
let mut document = self.document.write().await;
|
|
|
|
let _ = document.compose_delta(delta.clone())?;
|
|
|
|
let md5 = document.md5();
|
|
|
|
drop(document);
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
|
|
|
},
|
|
|
|
EditorCommand::ComposeRemoteDelta {
|
|
|
|
revisions,
|
|
|
|
client_delta,
|
|
|
|
server_delta,
|
|
|
|
ret,
|
|
|
|
} => {
|
|
|
|
let mut document = self.document.write().await;
|
|
|
|
let _ = document.compose_delta(client_delta.clone())?;
|
|
|
|
let md5 = document.md5();
|
|
|
|
for revision in &revisions {
|
|
|
|
let _ = self.rev_manager.add_remote_revision(revision).await?;
|
|
|
|
}
|
2022-01-02 10:34:42 +08:00
|
|
|
|
2022-01-05 23:15:55 +08:00
|
|
|
let (base_rev_id, rev_id) = self.rev_manager.next_rev_id_pair();
|
2022-01-14 15:23:21 +08:00
|
|
|
let doc_id = self.rev_manager.object_id.clone();
|
2022-01-05 23:15:55 +08:00
|
|
|
let user_id = self.user.user_id()?;
|
|
|
|
let (client_revision, server_revision) = make_client_and_server_revision(
|
|
|
|
&doc_id,
|
|
|
|
&user_id,
|
|
|
|
base_rev_id,
|
|
|
|
rev_id,
|
|
|
|
client_delta,
|
|
|
|
Some(server_delta),
|
|
|
|
md5,
|
|
|
|
);
|
|
|
|
let _ = self.rev_manager.add_remote_revision(&client_revision).await?;
|
|
|
|
let _ = ret.send(Ok(server_revision));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2022-01-05 23:15:55 +08:00
|
|
|
EditorCommand::OverrideDelta { revisions, delta, ret } => {
|
|
|
|
let mut document = self.document.write().await;
|
|
|
|
let _ = document.set_delta(delta);
|
|
|
|
let md5 = document.md5();
|
|
|
|
drop(document);
|
2022-01-02 10:34:42 +08:00
|
|
|
|
2022-01-05 23:15:55 +08:00
|
|
|
let repeated_revision = RepeatedRevision::new(revisions);
|
|
|
|
assert_eq!(repeated_revision.last().unwrap().md5, md5);
|
2022-01-14 15:23:21 +08:00
|
|
|
let _ = self.rev_manager.reset_object(repeated_revision).await?;
|
2022-01-05 23:15:55 +08:00
|
|
|
let _ = ret.send(Ok(()));
|
2022-01-02 10:34:42 +08:00
|
|
|
},
|
|
|
|
EditorCommand::TransformRevision { revisions, ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let f = || async {
|
2022-01-02 22:23:33 +08:00
|
|
|
let new_delta = make_delta_from_revisions(revisions)?;
|
2021-12-16 22:24:05 +08:00
|
|
|
let read_guard = self.document.read().await;
|
2022-01-02 10:34:42 +08:00
|
|
|
let mut server_prime: Option<RichTextDelta> = None;
|
|
|
|
let client_prime: RichTextDelta;
|
2022-01-06 12:39:32 +08:00
|
|
|
// The document is empty if its text is equal to the initial text.
|
2022-01-02 10:34:42 +08:00
|
|
|
if read_guard.is_empty::<NewlineDoc>() {
|
|
|
|
// Do nothing
|
|
|
|
client_prime = new_delta;
|
|
|
|
} else {
|
|
|
|
let (s_prime, c_prime) = read_guard.delta().transform(&new_delta)?;
|
|
|
|
client_prime = c_prime;
|
|
|
|
server_prime = Some(s_prime);
|
|
|
|
}
|
|
|
|
drop(read_guard);
|
|
|
|
Ok::<TransformDeltas, CollaborateError>(TransformDeltas {
|
2021-12-16 22:24:05 +08:00
|
|
|
client_prime,
|
|
|
|
server_prime,
|
2022-01-02 10:34:42 +08:00
|
|
|
})
|
2021-12-16 22:24:05 +08:00
|
|
|
};
|
|
|
|
let _ = ret.send(f().await);
|
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::Insert { index, data, ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let mut write_guard = self.document.write().await;
|
|
|
|
let delta = write_guard.insert(index, data)?;
|
|
|
|
let md5 = write_guard.md5();
|
2022-01-05 23:15:55 +08:00
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::Delete { interval, ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let mut write_guard = self.document.write().await;
|
|
|
|
let delta = write_guard.delete(interval)?;
|
|
|
|
let md5 = write_guard.md5();
|
2022-01-05 23:15:55 +08:00
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::Format {
|
2021-12-16 22:24:05 +08:00
|
|
|
interval,
|
|
|
|
attribute,
|
|
|
|
ret,
|
|
|
|
} => {
|
|
|
|
let mut write_guard = self.document.write().await;
|
|
|
|
let delta = write_guard.format(interval, attribute)?;
|
|
|
|
let md5 = write_guard.md5();
|
2022-01-05 23:15:55 +08:00
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::Replace { interval, data, ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let mut write_guard = self.document.write().await;
|
|
|
|
let delta = write_guard.replace(interval, data)?;
|
|
|
|
let md5 = write_guard.md5();
|
2022-01-05 23:15:55 +08:00
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::CanUndo { ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let _ = ret.send(self.document.read().await.can_undo());
|
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::CanRedo { ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let _ = ret.send(self.document.read().await.can_redo());
|
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::Undo { ret } => {
|
2022-01-05 23:15:55 +08:00
|
|
|
let mut write_guard = self.document.write().await;
|
|
|
|
let UndoResult { delta } = write_guard.undo()?;
|
|
|
|
let md5 = write_guard.md5();
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2021-12-18 18:35:45 +08:00
|
|
|
EditorCommand::Redo { ret } => {
|
2022-01-05 23:15:55 +08:00
|
|
|
let mut write_guard = self.document.write().await;
|
|
|
|
let UndoResult { delta } = write_guard.redo()?;
|
|
|
|
let md5 = write_guard.md5();
|
|
|
|
let _ = self.save_local_delta(delta, md5).await?;
|
|
|
|
let _ = ret.send(Ok(()));
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2022-01-12 12:40:41 +08:00
|
|
|
EditorCommand::ReadDocumentAsJson { ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let data = self.document.read().await.to_json();
|
|
|
|
let _ = ret.send(Ok(data));
|
|
|
|
},
|
2022-01-12 12:40:41 +08:00
|
|
|
EditorCommand::ReadDocumentAsDelta { ret } => {
|
2021-12-16 22:24:05 +08:00
|
|
|
let delta = self.document.read().await.delta().clone();
|
|
|
|
let _ = ret.send(Ok(delta));
|
|
|
|
},
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
2022-01-05 23:15:55 +08:00
|
|
|
|
|
|
|
async fn save_local_delta(&self, delta: RichTextDelta, md5: String) -> Result<RevId, FlowyError> {
|
|
|
|
let delta_data = delta.to_bytes();
|
|
|
|
let (base_rev_id, rev_id) = self.rev_manager.next_rev_id_pair();
|
|
|
|
let user_id = self.user.user_id()?;
|
2022-01-14 15:23:21 +08:00
|
|
|
let revision = Revision::new(
|
|
|
|
&self.rev_manager.object_id,
|
|
|
|
base_rev_id,
|
|
|
|
rev_id,
|
|
|
|
delta_data,
|
|
|
|
&user_id,
|
|
|
|
md5,
|
|
|
|
);
|
2022-01-05 23:15:55 +08:00
|
|
|
let _ = self.rev_manager.add_local_revision(&revision).await?;
|
|
|
|
Ok(rev_id.into())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn make_client_and_server_revision(
|
|
|
|
doc_id: &str,
|
|
|
|
user_id: &str,
|
|
|
|
base_rev_id: i64,
|
|
|
|
rev_id: i64,
|
|
|
|
client_delta: RichTextDelta,
|
|
|
|
server_delta: Option<RichTextDelta>,
|
|
|
|
md5: DocumentMD5,
|
|
|
|
) -> (Revision, Option<Revision>) {
|
|
|
|
let client_revision = Revision::new(
|
|
|
|
&doc_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(&doc_id, base_rev_id, rev_id, server_delta.to_bytes(), &user_id, md5);
|
|
|
|
(client_revision, Some(server_revision))
|
|
|
|
},
|
|
|
|
}
|
2021-12-16 22:24:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) type Ret<T> = oneshot::Sender<Result<T, CollaborateError>>;
|
|
|
|
pub(crate) type DocumentMD5 = String;
|
|
|
|
|
2021-12-18 18:35:45 +08:00
|
|
|
pub(crate) enum EditorCommand {
|
2022-01-05 23:15:55 +08:00
|
|
|
ComposeLocalDelta {
|
2021-12-16 22:24:05 +08:00
|
|
|
delta: RichTextDelta,
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
|
|
|
},
|
|
|
|
ComposeRemoteDelta {
|
|
|
|
revisions: Vec<Revision>,
|
|
|
|
client_delta: RichTextDelta,
|
|
|
|
server_delta: RichTextDelta,
|
|
|
|
ret: Ret<Option<Revision>>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2022-01-02 10:34:42 +08:00
|
|
|
OverrideDelta {
|
2022-01-05 23:15:55 +08:00
|
|
|
revisions: Vec<Revision>,
|
2022-01-02 10:34:42 +08:00
|
|
|
delta: RichTextDelta,
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2022-01-02 10:34:42 +08:00
|
|
|
},
|
|
|
|
TransformRevision {
|
2021-12-25 21:44:45 +08:00
|
|
|
revisions: Vec<Revision>,
|
2021-12-16 22:24:05 +08:00
|
|
|
ret: Ret<TransformDeltas>,
|
|
|
|
},
|
|
|
|
Insert {
|
|
|
|
index: usize,
|
|
|
|
data: String,
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
|
|
|
Delete {
|
|
|
|
interval: Interval,
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
|
|
|
Format {
|
|
|
|
interval: Interval,
|
|
|
|
attribute: RichTextAttribute,
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
|
|
|
Replace {
|
|
|
|
interval: Interval,
|
|
|
|
data: String,
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
|
|
|
CanUndo {
|
|
|
|
ret: oneshot::Sender<bool>,
|
|
|
|
},
|
|
|
|
CanRedo {
|
|
|
|
ret: oneshot::Sender<bool>,
|
|
|
|
},
|
|
|
|
Undo {
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
|
|
|
Redo {
|
2022-01-05 23:15:55 +08:00
|
|
|
ret: Ret<()>,
|
2021-12-16 22:24:05 +08:00
|
|
|
},
|
2022-01-12 12:40:41 +08:00
|
|
|
ReadDocumentAsJson {
|
2021-12-16 22:24:05 +08:00
|
|
|
ret: Ret<String>,
|
|
|
|
},
|
2022-01-09 15:13:45 +08:00
|
|
|
#[allow(dead_code)]
|
2022-01-12 12:40:41 +08:00
|
|
|
ReadDocumentAsDelta {
|
2021-12-16 22:24:05 +08:00
|
|
|
ret: Ret<RichTextDelta>,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2022-01-05 23:15:55 +08:00
|
|
|
impl std::fmt::Debug for EditorCommand {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
|
|
|
let s = match self {
|
|
|
|
EditorCommand::ComposeLocalDelta { .. } => "ComposeLocalDelta",
|
|
|
|
EditorCommand::ComposeRemoteDelta { .. } => "ComposeRemoteDelta",
|
|
|
|
EditorCommand::OverrideDelta { .. } => "OverrideDelta",
|
|
|
|
EditorCommand::TransformRevision { .. } => "TransformRevision",
|
|
|
|
EditorCommand::Insert { .. } => "Insert",
|
|
|
|
EditorCommand::Delete { .. } => "Delete",
|
|
|
|
EditorCommand::Format { .. } => "Format",
|
|
|
|
EditorCommand::Replace { .. } => "Replace",
|
|
|
|
EditorCommand::CanUndo { .. } => "CanUndo",
|
|
|
|
EditorCommand::CanRedo { .. } => "CanRedo",
|
|
|
|
EditorCommand::Undo { .. } => "Undo",
|
|
|
|
EditorCommand::Redo { .. } => "Redo",
|
2022-01-12 12:40:41 +08:00
|
|
|
EditorCommand::ReadDocumentAsJson { .. } => "ReadDocumentAsJson",
|
|
|
|
EditorCommand::ReadDocumentAsDelta { .. } => "ReadDocumentAsDelta",
|
2022-01-05 23:15:55 +08:00
|
|
|
};
|
|
|
|
f.write_str(s)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-16 22:24:05 +08:00
|
|
|
pub(crate) struct TransformDeltas {
|
|
|
|
pub client_prime: RichTextDelta,
|
2022-01-02 10:34:42 +08:00
|
|
|
pub server_prime: Option<RichTextDelta>,
|
2021-12-16 22:24:05 +08:00
|
|
|
}
|