using CacheActor method to handle the ws message one by one

.gitignore

@@ -10,4 +10,5 @@ Cargo.lock
 **/*.rs.bk
 **/target/
 **/*.db
-.idea/
+.idea/
+/flowy-test/

app_flowy/packages/flowy_sdk/lib/protobuf/flowy-document/revision.pb.dart

@@ -18,7 +18,7 @@ class Revision extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'Revision', createEmptyInstance: create)
     ..aInt64(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'baseRevId')
     ..aInt64(2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'revId')
-    ..a<$core.List<$core.int>>(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'delta', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'deltaData', $pb.PbFieldType.OY)
     ..aOS(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'md5')
     ..aOS(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'docId')
     ..e<RevType>(6, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'ty', $pb.PbFieldType.OE, defaultOrMaker: RevType.Local, valueOf: RevType.valueOf, enumValues: RevType.values)
@@ -29,7 +29,7 @@ class Revision extends $pb.GeneratedMessage {
   factory Revision({
     $fixnum.Int64? baseRevId,
     $fixnum.Int64? revId,
-    $core.List<$core.int>? delta,
+    $core.List<$core.int>? deltaData,
     $core.String? md5,
     $core.String? docId,
     RevType? ty,
@@ -41,8 +41,8 @@ class Revision extends $pb.GeneratedMessage {
     if (revId != null) {
       _result.revId = revId;
     }
-    if (delta != null) {
+    if (deltaData != null) {
-      _result.delta = delta;
+      _result.deltaData = deltaData;
     }
     if (md5 != null) {
       _result.md5 = md5;
@@ -95,13 +95,13 @@ class Revision extends $pb.GeneratedMessage {
   void clearRevId() => clearField(2);
 
   @$pb.TagNumber(3)
-  $core.List<$core.int> get delta => $_getN(2);
+  $core.List<$core.int> get deltaData => $_getN(2);
   @$pb.TagNumber(3)
-  set delta($core.List<$core.int> v) { $_setBytes(2, v); }
+  set deltaData($core.List<$core.int> v) { $_setBytes(2, v); }
   @$pb.TagNumber(3)
-  $core.bool hasDelta() => $_has(2);
+  $core.bool hasDeltaData() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDelta() => clearField(3);
+  void clearDeltaData() => clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get md5 => $_getSZ(3);

app_flowy/packages/flowy_sdk/lib/protobuf/flowy-document/revision.pbjson.dart

@@ -25,7 +25,7 @@ const Revision$json = const {
   '2': const [
     const {'1': 'base_rev_id', '3': 1, '4': 1, '5': 3, '10': 'baseRevId'},
     const {'1': 'rev_id', '3': 2, '4': 1, '5': 3, '10': 'revId'},
-    const {'1': 'delta', '3': 3, '4': 1, '5': 12, '10': 'delta'},
+    const {'1': 'delta_data', '3': 3, '4': 1, '5': 12, '10': 'deltaData'},
     const {'1': 'md5', '3': 4, '4': 1, '5': 9, '10': 'md5'},
     const {'1': 'doc_id', '3': 5, '4': 1, '5': 9, '10': 'docId'},
     const {'1': 'ty', '3': 6, '4': 1, '5': 14, '6': '.RevType', '10': 'ty'},
@@ -33,7 +33,7 @@ const Revision$json = const {
 };
 
 /// Descriptor for `Revision`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List revisionDescriptor = $convert.base64Decode('CghSZXZpc2lvbhIeCgtiYXNlX3Jldl9pZBgBIAEoA1IJYmFzZVJldklkEhUKBnJldl9pZBgCIAEoA1IFcmV2SWQSFAoFZGVsdGEYAyABKAxSBWRlbHRhEhAKA21kNRgEIAEoCVIDbWQ1EhUKBmRvY19pZBgFIAEoCVIFZG9jSWQSGAoCdHkYBiABKA4yCC5SZXZUeXBlUgJ0eQ==');
+final $typed_data.Uint8List revisionDescriptor = $convert.base64Decode('CghSZXZpc2lvbhIeCgtiYXNlX3Jldl9pZBgBIAEoA1IJYmFzZVJldklkEhUKBnJldl9pZBgCIAEoA1IFcmV2SWQSHQoKZGVsdGFfZGF0YRgDIAEoDFIJZGVsdGFEYXRhEhAKA21kNRgEIAEoCVIDbWQ1EhUKBmRvY19pZBgFIAEoCVIFZG9jSWQSGAoCdHkYBiABKA4yCC5SZXZUeXBlUgJ0eQ==');
 @$core.Deprecated('Use revisionRangeDescriptor instead')
 const RevisionRange$json = const {
   '1': 'RevisionRange',

backend/Cargo.toml

@@ -58,6 +58,7 @@ md5 = "0.7.0"
 futures-core = { version = "0.3", default-features = false }
 pin-project = "1.0.0"
 byteorder = {version = "1.3.4"}
+async-stream = "0.3.2"
 
 flowy-user = { path = "../rust-lib/flowy-user" }
 flowy-workspace = { path = "../rust-lib/flowy-workspace" }
@@ -93,10 +94,12 @@ path = "src/main.rs"
 parking_lot = "0.11"
 once_cell = "1.7.2"
 linkify = "0.5.0"
-flowy-user = { path = "../rust-lib/flowy-user" }
+flowy-user = { path = "../rust-lib/flowy-user", features = ["http_server"] }
-flowy-workspace = { path = "../rust-lib/flowy-workspace" }
+flowy-workspace = { path = "../rust-lib/flowy-workspace", features = ["http_server"] }
 flowy-ws = { path = "../rust-lib/flowy-ws" }
 flowy-sdk = { path = "../rust-lib/flowy-sdk" }
 flowy-test = { path = "../rust-lib/flowy-test" }
 flowy-infra = { path = "../rust-lib/flowy-infra" }
-flowy-ot = { path = "../rust-lib/flowy-ot" }
+flowy-ot = { path = "../rust-lib/flowy-ot" }
+flowy-document = { path = "../rust-lib/flowy-document", features = ["flowy_test", "http_server"] }
+flowy-sqlite = { path = "../rust-lib/flowy-sqlite" }

backend/src/application.rs

@@ -16,7 +16,6 @@ use crate::{
     service::{
         app::router as app,
         doc::router as doc,
-        make_ws_biz_handlers,
         user::router as user,
         view::router as view,
         workspace::router as workspace,
@@ -31,11 +30,10 @@ pub struct Application {
 }
 
 impl Application {
-    pub async fn build(configuration: Settings) -> Result<Self, std::io::Error> {
+    pub async fn build(configuration: Settings, app_ctx: AppContext) -> Result<Self, std::io::Error> {
         let address = format!("{}:{}", configuration.application.host, configuration.application.port);
         let listener = TcpListener::bind(&address)?;
         let port = listener.local_addr().unwrap().port();
-        let app_ctx = init_app_context(&configuration).await;
         let server = run(listener, app_ctx)?;
         Ok(Self { port, server })
     }
@@ -46,13 +44,9 @@ impl Application {
 }
 
 pub fn run(listener: TcpListener, app_ctx: AppContext) -> Result<Server, std::io::Error> {
-    let AppContext { ws_server, pg_pool } = app_ctx;
-    let ws_server = Data::new(ws_server);
-    let pg_pool = Data::new(pg_pool);
     let domain = domain();
     let secret: String = secret();
-    let ws_biz_handlers = Data::new(make_ws_biz_handlers(pg_pool.clone()));
+    actix_rt::spawn(period_check(app_ctx.pg_pool.clone()));
-    actix_rt::spawn(period_check(pg_pool.clone()));
 
     let server = HttpServer::new(move || {
         App::new()
@@ -63,9 +57,11 @@ pub fn run(listener: TcpListener, app_ctx: AppContext) -> Result<Server, std::io
             .app_data(web::JsonConfig::default().limit(4096))
             .service(ws_scope())
             .service(user_scope())
-            .app_data(ws_server.clone())
+            .app_data(app_ctx.ws_server.clone())
-            .app_data(pg_pool.clone())
+            .app_data(app_ctx.pg_pool.clone())
-            .app_data(ws_biz_handlers.clone())
+            .app_data(app_ctx.ws_bizs.clone())
+            .app_data(app_ctx.doc_biz.clone())
+            .app_data(app_ctx.runtime.clone())
     })
     .listen(listener)?
     .run();
@@ -129,8 +125,10 @@ fn user_scope() -> Scope {
         )
 }
 
-async fn init_app_context(configuration: &Settings) -> AppContext {
+pub async fn init_app_context(configuration: &Settings) -> AppContext {
-    let _ = crate::service::log::Builder::new("flowy").env_filter("Trace").build();
+    let _ = crate::service::log::Builder::new("flowy-server")
+        .env_filter("Trace")
+        .build();
     let pg_pool = get_connection_pool(&configuration.database).await.expect(&format!(
         "Failed to connect to Postgres at {:?}.",
         configuration.database

backend/src/context.rs

@@ -1,18 +1,48 @@
-use crate::service::ws::WsServer;
+use crate::service::{
+    doc::doc::DocBiz,
+    ws::{WsBizHandlers, WsServer},
+};
 use actix::Addr;
-
+use actix_web::web::Data;
+use flowy_ws::WsModule;
 use sqlx::PgPool;
+use std::{io, sync::Arc};
 
+pub type FlowyRuntime = tokio::runtime::Runtime;
+
+#[derive(Clone)]
 pub struct AppContext {
-    pub ws_server: Addr<WsServer>,
+    pub ws_server: Data<Addr<WsServer>>,
-    pub pg_pool: PgPool,
+    pub pg_pool: Data<PgPool>,
+    pub ws_bizs: Data<WsBizHandlers>,
+    pub doc_biz: Data<Arc<DocBiz>>,
+    pub runtime: Data<FlowyRuntime>,
 }
 
 impl AppContext {
     pub fn new(ws_server: Addr<WsServer>, db_pool: PgPool) -> Self {
+        let ws_server = Data::new(ws_server);
+        let pg_pool = Data::new(db_pool);
+        let runtime = Data::new(runtime().unwrap());
+
+        let mut ws_bizs = WsBizHandlers::new();
+        let doc_biz = Arc::new(DocBiz::new(pg_pool.clone()));
+        ws_bizs.register(WsModule::Doc, doc_biz.clone());
+
         AppContext {
             ws_server,
-            pg_pool: db_pool,
+            pg_pool,
+            ws_bizs: Data::new(ws_bizs),
+            doc_biz: Data::new(doc_biz),
+            runtime,
         }
     }
 }
+
+fn runtime() -> io::Result<tokio::runtime::Runtime> {
+    tokio::runtime::Builder::new_multi_thread()
+        .thread_name("flowy-server-rt")
+        .enable_io()
+        .enable_time()
+        .build()
+}

backend/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod application;
 pub mod config;
-mod context;
+pub mod context;
 mod entities;
 mod middleware;
-mod service;
+pub mod service;
 mod sqlx_ext;

backend/src/main.rs

@@ -1,9 +1,13 @@
-use backend::{application::Application, config::get_configuration};
+use backend::{
+    application::{init_app_context, Application},
+    config::get_configuration,
+};
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
     let configuration = get_configuration().expect("Failed to read configuration.");
-    let application = Application::build(configuration).await?;
+    let app_ctx = init_app_context(&configuration).await;
+    let application = Application::build(configuration, app_ctx).await?;
     application.run_until_stopped().await?;
 
     Ok(())

backend/src/service/doc/crud.rs

@@ -0,0 +1,121 @@
+use crate::{
+    entities::doc::{DocTable, DOC_TABLE},
+    sqlx_ext::{map_sqlx_error, DBTransaction, SqlBuilder},
+};
+use anyhow::Context;
+use flowy_document::protobuf::{CreateDocParams, Doc, QueryDocParams, UpdateDocParams};
+use flowy_net::errors::ServerError;
+use sqlx::{postgres::PgArguments, PgPool, Postgres};
+use uuid::Uuid;
+
+#[tracing::instrument(level = "debug", skip(transaction), err)]
+pub(crate) async fn create_doc(
+    transaction: &mut DBTransaction<'_>,
+    params: CreateDocParams,
+) -> Result<(), ServerError> {
+    let uuid = Uuid::parse_str(&params.id)?;
+    let (sql, args) = NewDocSqlBuilder::new(uuid).data(params.data).build()?;
+    let _ = sqlx::query_with(&sql, args)
+        .execute(transaction)
+        .await
+        .map_err(map_sqlx_error)?;
+
+    Ok(())
+}
+
+#[tracing::instrument(level = "debug", skip(pool), err)]
+pub(crate) async fn read_doc(pool: &PgPool, params: QueryDocParams) -> Result<Doc, ServerError> {
+    let doc_id = Uuid::parse_str(&params.doc_id)?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .context("Failed to acquire a Postgres connection to read doc")?;
+
+    let builder = SqlBuilder::select(DOC_TABLE).add_field("*").and_where_eq("id", &doc_id);
+
+    let (sql, args) = builder.build()?;
+    // TODO: benchmark the speed of different documents with different size
+    let doc: Doc = sqlx::query_as_with::<Postgres, DocTable, PgArguments>(&sql, args)
+        .fetch_one(&mut transaction)
+        .await
+        .map_err(map_sqlx_error)?
+        .into();
+
+    transaction
+        .commit()
+        .await
+        .context("Failed to commit SQL transaction to read doc.")?;
+
+    Ok(doc)
+}
+
+#[tracing::instrument(level = "debug", skip(pool, params), err)]
+pub(crate) async fn update_doc(pool: &PgPool, mut params: UpdateDocParams) -> Result<(), ServerError> {
+    let doc_id = Uuid::parse_str(&params.doc_id)?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .context("Failed to acquire a Postgres connection to update doc")?;
+
+    let data = Some(params.take_data());
+
+    let (sql, args) = SqlBuilder::update(DOC_TABLE)
+        .add_some_arg("data", data)
+        .add_arg("rev_id", params.rev_id)
+        .and_where_eq("id", doc_id)
+        .build()?;
+
+    sqlx::query_with(&sql, args)
+        .execute(&mut transaction)
+        .await
+        .map_err(map_sqlx_error)?;
+
+    transaction
+        .commit()
+        .await
+        .context("Failed to commit SQL transaction to update doc.")?;
+
+    Ok(())
+}
+
+#[tracing::instrument(level = "debug", skip(transaction), err)]
+pub(crate) async fn delete_doc(transaction: &mut DBTransaction<'_>, doc_id: Uuid) -> Result<(), ServerError> {
+    let (sql, args) = SqlBuilder::delete(DOC_TABLE).and_where_eq("id", doc_id).build()?;
+
+    let _ = sqlx::query_with(&sql, args)
+        .execute(transaction)
+        .await
+        .map_err(map_sqlx_error)?;
+
+    Ok(())
+}
+
+pub struct NewDocSqlBuilder {
+    table: DocTable,
+}
+
+impl NewDocSqlBuilder {
+    pub fn new(id: Uuid) -> Self {
+        let table = DocTable {
+            id,
+            data: "".to_owned(),
+            rev_id: 0,
+        };
+        Self { table }
+    }
+
+    pub fn data(mut self, data: String) -> Self {
+        self.table.data = data;
+        self
+    }
+
+    pub fn build(self) -> Result<(String, PgArguments), ServerError> {
+        let (sql, args) = SqlBuilder::create(DOC_TABLE)
+            .add_arg("id", self.table.id)
+            .add_arg("data", self.table.data)
+            .add_arg("rev_id", self.table.rev_id)
+            .build()?;
+
+        Ok((sql, args))
+    }
+}

backend/src/service/doc/doc.rs

@@ -1,92 +1,89 @@
-use super::sql_builder::*;
+use super::edit_doc::EditDocContext;
-use crate::{
+use crate::service::{
-    entities::doc::{DocTable, DOC_TABLE},
+    doc::{
-    sqlx_ext::{map_sqlx_error, DBTransaction, SqlBuilder},
+        read_doc,
+        ws_actor::{DocWsMsg, DocWsMsgActor},
+    },
+    ws::{WsBizHandler, WsClientData},
 };
-use anyhow::Context;
+use actix_web::web::Data;
-use flowy_document::protobuf::{CreateDocParams, Doc, QueryDocParams, UpdateDocParams};
+use dashmap::DashMap;
+use flowy_document::protobuf::QueryDocParams;
 use flowy_net::errors::ServerError;
-use sqlx::{postgres::PgArguments, PgPool, Postgres};
-use uuid::Uuid;
 
-#[tracing::instrument(level = "debug", skip(transaction), err)]
+use protobuf::Message;
-pub(crate) async fn create_doc(
+use sqlx::PgPool;
-    transaction: &mut DBTransaction<'_>,
+use std::{sync::Arc, time::Duration};
-    params: CreateDocParams,
+use tokio::sync::{mpsc, mpsc::error::SendError, oneshot};
-) -> Result<(), ServerError> {
-    let uuid = Uuid::parse_str(&params.id)?;
-    let (sql, args) = NewDocSqlBuilder::new(uuid).data(params.data).build()?;
-    let _ = sqlx::query_with(&sql, args)
-        .execute(transaction)
-        .await
-        .map_err(map_sqlx_error)?;
 
-    Ok(())
+pub struct DocBiz {
+    pub manager: Arc<DocManager>,
+    sender: mpsc::Sender<DocWsMsg>,
+    pg_pool: Data<PgPool>,
 }
 
-#[tracing::instrument(level = "debug", skip(pool), err)]
+impl DocBiz {
-pub(crate) async fn read_doc(pool: &PgPool, params: QueryDocParams) -> Result<Doc, ServerError> {
+    pub fn new(pg_pool: Data<PgPool>) -> Self {
-    let doc_id = Uuid::parse_str(&params.doc_id)?;
+        let manager = Arc::new(DocManager::new());
-    let mut transaction = pool
+        let (tx, rx) = mpsc::channel(100);
-        .begin()
+        let actor = DocWsMsgActor::new(rx, manager.clone());
-        .await
+        tokio::task::spawn(actor.run());
-        .context("Failed to acquire a Postgres connection to read doc")?;
+        Self {
-
+            manager,
-    let builder = SqlBuilder::select(DOC_TABLE).add_field("*").and_where_eq("id", &doc_id);
+            sender: tx,
-
+            pg_pool,
-    let (sql, args) = builder.build()?;
+        }
-    // TODO: benchmark the speed of different documents with different size
+    }
-    let doc: Doc = sqlx::query_as_with::<Postgres, DocTable, PgArguments>(&sql, args)
-        .fetch_one(&mut transaction)
-        .await
-        .map_err(map_sqlx_error)?
-        .into();
-
-    transaction
-        .commit()
-        .await
-        .context("Failed to commit SQL transaction to read doc.")?;
-
-    Ok(doc)
 }
 
-#[tracing::instrument(level = "debug", skip(pool, params), err)]
+impl WsBizHandler for DocBiz {
-pub(crate) async fn update_doc(pool: &PgPool, mut params: UpdateDocParams) -> Result<(), ServerError> {
+    fn receive_data(&self, client_data: WsClientData) {
-    let doc_id = Uuid::parse_str(&params.doc_id)?;
+        let (ret, rx) = oneshot::channel();
-    let mut transaction = pool
+        let sender = self.sender.clone();
-        .begin()
+        let pool = self.pg_pool.clone();
-        .await
-        .context("Failed to acquire a Postgres connection to update doc")?;
 
-    let data = Some(params.take_data());
+        actix_rt::spawn(async move {
-
+            let msg = DocWsMsg::ClientData {
-    let (sql, args) = SqlBuilder::update(DOC_TABLE)
+                data: client_data,
-        .add_some_arg("data", data)
+                ret,
-        .add_arg("rev_id", params.rev_id)
+                pool,
-        .and_where_eq("id", doc_id)
+            };
-        .build()?;
+            match sender.send(msg).await {
-
+                Ok(_) => {},
-    sqlx::query_with(&sql, args)
+                Err(e) => log::error!("{}", e),
-        .execute(&mut transaction)
+            }
-        .await
+            match rx.await {
-        .map_err(map_sqlx_error)?;
+                Ok(_) => {},
-
+                Err(e) => log::error!("{:?}", e),
-    transaction
+            };
-        .commit()
+        });
-        .await
+    }
-        .context("Failed to commit SQL transaction to update doc.")?;
-
-    Ok(())
 }
 
-#[tracing::instrument(level = "debug", skip(transaction), err)]
+pub struct DocManager {
-pub(crate) async fn delete_doc(transaction: &mut DBTransaction<'_>, doc_id: Uuid) -> Result<(), ServerError> {
+    docs_map: DashMap<String, Arc<EditDocContext>>,
-    let (sql, args) = SqlBuilder::delete(DOC_TABLE).and_where_eq("id", doc_id).build()?;
+}
-
+
-    let _ = sqlx::query_with(&sql, args)
+impl DocManager {
-        .execute(transaction)
+    pub fn new() -> Self {
-        .await
+        Self {
-        .map_err(map_sqlx_error)?;
+            docs_map: DashMap::new(),
-
+        }
-    Ok(())
+    }
+
+    pub async fn get(&self, doc_id: &str, pg_pool: Data<PgPool>) -> Result<Option<Arc<EditDocContext>>, ServerError> {
+        match self.docs_map.get(doc_id) {
+            None => {
+                let params = QueryDocParams {
+                    doc_id: doc_id.to_string(),
+                    ..Default::default()
+                };
+                let doc = read_doc(pg_pool.get_ref(), params).await?;
+                let edit_doc = Arc::new(EditDocContext::new(doc)?);
+                self.docs_map.insert(doc_id.to_string(), edit_doc.clone());
+                Ok(Some(edit_doc))
+            },
+            Some(ctx) => Ok(Some(ctx.clone())),
+        }
+    }
 }

backend/src/service/doc/edit_doc.rs

@@ -1,9 +1,8 @@
 use crate::service::{
-    doc::update_doc,
     util::md5,
     ws::{entities::Socket, WsClientData, WsMessageAdaptor, WsUser},
 };
-use actix_web::web::Data;
+
 use byteorder::{BigEndian, WriteBytesExt};
 use bytes::Bytes;
 use dashmap::DashMap;
@@ -20,7 +19,7 @@ use flowy_ot::{
 use flowy_ws::WsMessage;
 use parking_lot::RwLock;
 use protobuf::Message;
-use sqlx::PgPool;
+
 use std::{
     convert::TryInto,
     sync::{
@@ -35,16 +34,15 @@ struct EditUser {
     socket: Socket,
 }
 
-pub(crate) struct EditDocContext {
+pub struct EditDocContext {
     doc_id: String,
     rev_id: AtomicI64,
     document: Arc<RwLock<Document>>,
-    pg_pool: Data<PgPool>,
     users: DashMap<String, EditUser>,
 }
 
 impl EditDocContext {
-    pub(crate) fn new(doc: Doc, pg_pool: Data<PgPool>) -> Result<Self, ServerError> {
+    pub fn new(doc: Doc) -> Result<Self, ServerError> {
         let delta = Delta::from_bytes(&doc.data).map_err(internal_error)?;
         let document = Arc::new(RwLock::new(Document::from_delta(delta)));
         let users = DashMap::new();
@@ -52,17 +50,14 @@ impl EditDocContext {
             doc_id: doc.id.clone(),
             rev_id: AtomicI64::new(doc.rev_id),
             document,
-            pg_pool,
             users,
         })
     }
 
+    pub fn doc_json(&self) -> String { self.document.read().to_json() }
+
     #[tracing::instrument(level = "debug", skip(self, client_data, revision))]
-    pub(crate) async fn apply_revision(
+    pub async fn apply_revision(&self, client_data: WsClientData, revision: Revision) -> Result<(), ServerError> {
-        &self,
-        client_data: WsClientData,
-        revision: Revision,
-    ) -> Result<(), ServerError> {
         let _ = self.verify_md5(&revision)?;
         // Opti: find out another way to keep the user socket available.
         let user = EditUser {
@@ -85,7 +80,7 @@ impl EditDocContext {
             // send the prime delta to the client. Client should compose the this prime
             // delta.
 
-            let (cli_prime, server_prime) = self.transform(&revision.delta).map_err(internal_error)?;
+            let (cli_prime, server_prime) = self.transform(&revision.delta_data).map_err(internal_error)?;
             let _ = self.update_document_delta(server_prime)?;
 
             log::debug!("{} client delta: {}", self.doc_id, cli_prime.to_json());
@@ -101,7 +96,7 @@ impl EditDocContext {
                     .do_send(mk_pull_rev_ws_message(&self.doc_id, cur_rev_id, revision.rev_id))
                     .map_err(internal_error)?;
             } else {
-                let delta = Delta::from_bytes(&revision.delta).map_err(internal_error)?;
+                let delta = Delta::from_bytes(&revision.delta_data).map_err(internal_error)?;
                 let _ = self.update_document_delta(delta)?;
                 cli_socket
                     .do_send(mk_acked_ws_message(&revision))
@@ -118,12 +113,12 @@ impl EditDocContext {
     }
 
     fn mk_revision(&self, base_rev_id: i64, delta: Delta) -> Revision {
-        let delta_data = delta.into_bytes();
+        let delta_data = delta.to_bytes().to_vec();
         let md5 = md5(&delta_data);
         let revision = Revision {
             base_rev_id,
             rev_id: self.rev_id.load(SeqCst),
-            delta: delta_data,
+            delta_data,
             md5,
             doc_id: self.doc_id.to_string(),
             ty: RevType::Remote,
@@ -160,7 +155,7 @@ impl EditDocContext {
     }
 
     fn verify_md5(&self, revision: &Revision) -> Result<(), ServerError> {
-        if md5(&revision.delta) != revision.md5 {
+        if md5(&revision.delta_data) != revision.md5 {
             return Err(ServerError::internal().context("Delta md5 not match"));
         }
         Ok(())
@@ -173,7 +168,7 @@ impl EditDocContext {
         params.set_doc_id(self.doc_id.clone());
         params.set_data(self.document.read().to_json());
         params.set_rev_id(revision.rev_id);
-        let _ = update_doc(self.pg_pool.get_ref(), params).await?;
+        // let _ = update_doc(self.pg_pool.get_ref(), params).await?;
         Ok(())
     }
 }

backend/src/service/doc/mod.rs

@@ -1,8 +1,8 @@
-mod doc;
+pub mod crud;
-mod edit_doc_context;
+pub mod doc;
+pub mod edit_doc;
 pub mod router;
-mod sql_builder;
+mod ws_actor;
-pub mod ws_handler;
 
-pub(crate) use doc::*;
+pub(crate) use crud::*;
 pub use router::*;

backend/src/service/doc/sql_builder.rs

@@ -1,39 +0,0 @@
-use crate::{
-    entities::doc::{DocTable, DOC_TABLE},
-    sqlx_ext::SqlBuilder,
-};
-
-use flowy_net::errors::ServerError;
-
-use sqlx::postgres::PgArguments;
-use uuid::Uuid;
-
-pub struct NewDocSqlBuilder {
-    table: DocTable,
-}
-
-impl NewDocSqlBuilder {
-    pub fn new(id: Uuid) -> Self {
-        let table = DocTable {
-            id,
-            data: "".to_owned(),
-            rev_id: 0,
-        };
-        Self { table }
-    }
-
-    pub fn data(mut self, data: String) -> Self {
-        self.table.data = data;
-        self
-    }
-
-    pub fn build(self) -> Result<(String, PgArguments), ServerError> {
-        let (sql, args) = SqlBuilder::create(DOC_TABLE)
-            .add_arg("id", self.table.id)
-            .add_arg("data", self.table.data)
-            .add_arg("rev_id", self.table.rev_id)
-            .build()?;
-
-        Ok((sql, args))
-    }
-}

backend/src/service/doc/ws_actor.rs

@@ -0,0 +1,101 @@
+use crate::service::{doc::doc::DocManager, util::parse_from_bytes, ws::WsClientData};
+use actix_rt::task::spawn_blocking;
+use actix_web::web::Data;
+use async_stream::stream;
+use flowy_document::protobuf::{Revision, WsDataType, WsDocumentData};
+use flowy_net::errors::{internal_error, Result as DocResult};
+use futures::stream::StreamExt;
+use sqlx::PgPool;
+use std::sync::Arc;
+use tokio::sync::{mpsc, oneshot};
+
+pub enum DocWsMsg {
+    ClientData {
+        data: WsClientData,
+        pool: Data<PgPool>,
+        ret: oneshot::Sender<DocResult<()>>,
+    },
+}
+
+pub struct DocWsMsgActor {
+    receiver: Option<mpsc::Receiver<DocWsMsg>>,
+    doc_manager: Arc<DocManager>,
+}
+
+impl DocWsMsgActor {
+    pub fn new(receiver: mpsc::Receiver<DocWsMsg>, manager: Arc<DocManager>) -> Self {
+        Self {
+            receiver: Some(receiver),
+            doc_manager: manager,
+        }
+    }
+
+    pub async fn run(mut self) {
+        let mut receiver = self
+            .receiver
+            .take()
+            .expect("DocActor's receiver should only take one time");
+
+        let stream = stream! {
+            loop {
+                match receiver.recv().await {
+                    Some(msg) => yield msg,
+                    None => break,
+                }
+            }
+        };
+
+        stream.for_each(|msg| self.handle_message(msg)).await;
+    }
+
+    async fn handle_message(&self, msg: DocWsMsg) {
+        match msg {
+            DocWsMsg::ClientData { data, pool, ret } => {
+                ret.send(self.handle_client_data(data, pool).await);
+            },
+        }
+    }
+
+    async fn handle_client_data(&self, data: WsClientData, pool: Data<PgPool>) -> DocResult<()> {
+        let bytes = data.data.clone();
+        let document_data = spawn_blocking(move || {
+            let document_data: WsDocumentData = parse_from_bytes(&bytes)?;
+            DocResult::Ok(document_data)
+        })
+        .await
+        .map_err(internal_error)??;
+
+        match document_data.ty {
+            WsDataType::Acked => {},
+            WsDataType::PushRev => self.handle_push_rev(data, document_data.data, pool).await?,
+            WsDataType::PullRev => {},
+            WsDataType::Conflict => {},
+        }
+        Ok(())
+    }
+
+    async fn handle_push_rev(
+        &self,
+        client_data: WsClientData,
+        revision_data: Vec<u8>,
+        pool: Data<PgPool>,
+    ) -> DocResult<()> {
+        let revision = spawn_blocking(move || {
+            let revision: Revision = parse_from_bytes(&revision_data)?;
+            DocResult::Ok(revision)
+        })
+        .await
+        .map_err(internal_error)??;
+
+        match self.doc_manager.get(&revision.doc_id, pool).await? {
+            Some(ctx) => {
+                ctx.apply_revision(client_data, revision).await;
+                Ok(())
+            },
+            None => {
+                //
+                Ok(())
+            },
+        }
+    }
+}

backend/src/service/doc/ws_handler.rs

@@ -1,100 +0,0 @@
-use super::edit_doc_context::EditDocContext;
-use crate::service::{
-    doc::read_doc,
-    util::parse_from_bytes,
-    ws::{WsBizHandler, WsClientData},
-};
-use actix_web::web::Data;
-
-use flowy_document::protobuf::{QueryDocParams, Revision, WsDataType, WsDocumentData};
-use flowy_net::errors::ServerError;
-use parking_lot::{RwLock, RwLockUpgradableReadGuard};
-use protobuf::Message;
-use sqlx::PgPool;
-use std::{collections::HashMap, sync::Arc};
-
-pub struct DocWsBizHandler {
-    doc_manager: Arc<EditDocManager>,
-}
-
-impl DocWsBizHandler {
-    pub fn new(pg_pool: Data<PgPool>) -> Self {
-        Self {
-            doc_manager: Arc::new(EditDocManager::new(pg_pool)),
-        }
-    }
-}
-
-impl WsBizHandler for DocWsBizHandler {
-    fn receive_data(&self, client_data: WsClientData) {
-        let doc_manager = self.doc_manager.clone();
-        actix_rt::spawn(async move {
-            let result = doc_manager.handle(client_data).await;
-            match result {
-                Ok(_) => {},
-                Err(e) => log::error!("WsBizHandler handle data error: {:?}", e),
-            }
-        });
-    }
-}
-
-struct EditDocManager {
-    pg_pool: Data<PgPool>,
-    edit_docs: RwLock<HashMap<String, Arc<EditDocContext>>>,
-}
-
-impl EditDocManager {
-    fn new(pg_pool: Data<PgPool>) -> Self {
-        Self {
-            pg_pool,
-            edit_docs: RwLock::new(HashMap::new()),
-        }
-    }
-
-    async fn handle(&self, client_data: WsClientData) -> Result<(), ServerError> {
-        let document_data: WsDocumentData = parse_from_bytes(&client_data.data)?;
-        match document_data.ty {
-            WsDataType::Acked => {
-                // Do nothing,
-            },
-            WsDataType::PushRev => {
-                let revision: Revision = parse_from_bytes(&document_data.data)?;
-                let edited_doc = self.get_edit_doc(&revision.doc_id).await?;
-                tokio::spawn(async move {
-                    match edited_doc.apply_revision(client_data, revision).await {
-                        Ok(_) => {},
-                        Err(e) => log::error!("Doc apply revision failed: {:?}", e),
-                    }
-                });
-            },
-            WsDataType::PullRev => {
-                // Do nothing
-            },
-            WsDataType::Conflict => {
-                unimplemented!()
-            },
-        }
-
-        Ok(())
-    }
-
-    async fn get_edit_doc(&self, doc_id: &str) -> Result<Arc<EditDocContext>, ServerError> {
-        // Opti: using lock free map instead?
-        let edit_docs = self.edit_docs.upgradable_read();
-        if let Some(doc) = edit_docs.get(doc_id) {
-            return Ok(doc.clone());
-        } else {
-            let mut edit_docs = RwLockUpgradableReadGuard::upgrade(edit_docs);
-            let pg_pool = self.pg_pool.clone();
-            let params = QueryDocParams {
-                doc_id: doc_id.to_string(),
-                ..Default::default()
-            };
-
-            let doc = read_doc(pg_pool.get_ref(), params).await?;
-            let edit_doc = Arc::new(EditDocContext::new(doc, self.pg_pool.clone())?);
-            edit_docs.insert(doc_id.to_string(), edit_doc.clone());
-            Ok(edit_doc)
-        }
-    }
-}

backend/src/service/log/mod.rs

@@ -30,7 +30,7 @@ impl Builder {
             .with_target(true)
             .with_max_level(tracing::Level::DEBUG)
             .with_writer(std::io::stderr)
-            .with_thread_ids(false)
+            .with_thread_ids(true)
             .compact()
             .finish()
             .with(env_filter);

backend/src/service/mod.rs

@@ -1,9 +1,3 @@
-use crate::service::{doc::ws_handler::DocWsBizHandler, ws::WsBizHandlers};
-use actix_web::web::Data;
-use flowy_ws::WsModule;
-use sqlx::PgPool;
-use std::sync::Arc;
-
 pub mod app;
 pub mod doc;
 pub(crate) mod log;
@@ -12,16 +6,3 @@ pub(crate) mod util;
 pub mod view;
 pub mod workspace;
 pub mod ws;
-
-pub fn make_ws_biz_handlers(pg_pool: Data<PgPool>) -> WsBizHandlers {
-    let mut ws_biz_handlers = WsBizHandlers::new();
-
-    // doc
-    let doc_biz_handler = DocWsBizHandler::new(pg_pool);
-    ws_biz_handlers.register(WsModule::Doc, wrap(doc_biz_handler));
-
-    //
-    ws_biz_handlers
-}
-
-fn wrap<T>(val: T) -> Arc<T> { Arc::new(val) }

backend/src/service/user/auth.rs

@@ -8,14 +8,7 @@ use flowy_net::{
 };
 use flowy_user::{
     entities::parser::{UserEmail, UserName, UserPassword},
-    protobuf::{
+    protobuf::{SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile},
-        SignInParams,
-        SignInResponse,
-        SignUpParams,
-        SignUpResponse,
-        UpdateUserParams,
-        UserProfile,
-    },
 };
 
 use crate::{
@@ -28,10 +21,8 @@ use super::AUTHORIZED_USERS;
 use crate::service::user::user_default::create_default_workspace;
 
 pub async fn sign_in(pool: &PgPool, params: SignInParams) -> Result<SignInResponse, ServerError> {
-    let email =
+    let email = UserEmail::parse(params.email).map_err(|e| ServerError::params_invalid().context(e))?;
-        UserEmail::parse(params.email).map_err(|e| ServerError::params_invalid().context(e))?;
+    let password = UserPassword::parse(params.password).map_err(|e| ServerError::params_invalid().context(e))?;
-    let password = UserPassword::parse(params.password)
-        .map_err(|e| ServerError::params_invalid().context(e))?;
 
     let mut transaction = pool
         .begin()
@@ -62,16 +53,10 @@ pub async fn sign_out(logged_user: LoggedUser) -> Result<FlowyResponse, ServerEr
     Ok(FlowyResponse::success())
 }
 
-pub async fn register_user(
+pub async fn register_user(pool: &PgPool, params: SignUpParams) -> Result<FlowyResponse, ServerError> {
-    pool: &PgPool,
+    let name = UserName::parse(params.name).map_err(|e| ServerError::params_invalid().context(e))?;
-    params: SignUpParams,
+    let email = UserEmail::parse(params.email).map_err(|e| ServerError::params_invalid().context(e))?;
-) -> Result<FlowyResponse, ServerError> {
+    let password = UserPassword::parse(params.password).map_err(|e| ServerError::params_invalid().context(e))?;
-    let name =
-        UserName::parse(params.name).map_err(|e| ServerError::params_invalid().context(e))?;
-    let email =
-        UserEmail::parse(params.email).map_err(|e| ServerError::params_invalid().context(e))?;
-    let password = UserPassword::parse(params.password)
-        .map_err(|e| ServerError::params_invalid().context(e))?;
 
     let mut transaction = pool
         .begin()
@@ -79,14 +64,9 @@ pub async fn register_user(
         .context("Failed to acquire a Postgres connection to register user")?;
 
     let _ = is_email_exist(&mut transaction, email.as_ref()).await?;
-    let response_data = insert_new_user(
+    let response_data = insert_new_user(&mut transaction, name.as_ref(), email.as_ref(), password.as_ref())
-        &mut transaction,
+        .await
-        name.as_ref(),
+        .context("Failed to insert user")?;
-        email.as_ref(),
-        password.as_ref(),
-    )
-    .await
-    .context("Failed to insert user")?;
 
     let logged_user = LoggedUser::new(&response_data.user_id);
     AUTHORIZED_USERS.store_auth(logged_user, true);
@@ -111,12 +91,11 @@ pub(crate) async fn get_user_profile(
         .context("Failed to acquire a Postgres connection to get user detail")?;
 
     let id = logged_user.as_uuid()?;
-    let user_table =
+    let user_table = sqlx::query_as::<Postgres, UserTable>("SELECT * FROM user_table WHERE id = $1")
-        sqlx::query_as::<Postgres, UserTable>("SELECT * FROM user_table WHERE id = $1")
+        .bind(id)
-            .bind(id)
+        .fetch_one(&mut transaction)
-            .fetch_one(&mut transaction)
+        .await
-            .await
+        .map_err(|err| ServerError::internal().context(err))?;
-            .map_err(|err| ServerError::internal().context(err))?;
 
     transaction
         .commit()
@@ -146,11 +125,7 @@ pub(crate) async fn set_user_profile(
 
     let name = match params.has_name() {
         false => None,
-        true => Some(
+        true => Some(UserName::parse(params.get_name().to_owned()).map_err(invalid_params)?.0),
-            UserName::parse(params.get_name().to_owned())
-                .map_err(invalid_params)?
-                .0,
-        ),
     };
 
     let email = match params.has_email() {
@@ -165,8 +140,7 @@ pub(crate) async fn set_user_profile(
     let password = match params.has_password() {
         false => None,
         true => {
-            let password =
+            let password = UserPassword::parse(params.get_password().to_owned()).map_err(invalid_params)?;
-                UserPassword::parse(params.get_password().to_owned()).map_err(invalid_params)?;
             let password = hash_password(password.as_ref())?;
             Some(password)
         },
@@ -192,10 +166,7 @@ pub(crate) async fn set_user_profile(
     Ok(FlowyResponse::success())
 }
 
-async fn is_email_exist(
+async fn is_email_exist(transaction: &mut DBTransaction<'_>, email: &str) -> Result<(), ServerError> {
-    transaction: &mut DBTransaction<'_>,
-    email: &str,
-) -> Result<(), ServerError> {
     let result = sqlx::query(r#"SELECT email FROM user_table WHERE email = $1"#)
         .bind(email)
         .fetch_optional(transaction)

backend/src/service/user/user_default.rs

@@ -6,6 +6,7 @@ use crate::{
     },
     sqlx_ext::{map_sqlx_error, DBTransaction},
 };
+
 use flowy_net::errors::ServerError;
 use flowy_workspace::{
     entities::view::DOC_DEFAULT_DATA,

backend/src/service/view/router.rs

@@ -5,21 +5,19 @@ use actix_web::{
 use sqlx::PgPool;
 
 use flowy_net::errors::ServerError;
-use flowy_workspace::protobuf::{
+use flowy_workspace::protobuf::{CreateViewParams, DeleteViewParams, QueryViewParams, UpdateViewParams};
-    CreateViewParams,
-    DeleteViewParams,
-    QueryViewParams,
-    UpdateViewParams,
-};
 
 use crate::service::{
+    doc::doc::DocBiz,
     util::parse_from_payload,
     view::{create_view, delete_view, read_view, update_view},
 };
+use std::sync::Arc;
 
 pub async fn create_handler(
     payload: Payload,
     pool: Data<PgPool>,
+    _doc_biz: Data<Arc<DocBiz>>,
 ) -> Result<HttpResponse, ServerError> {
     let params: CreateViewParams = parse_from_payload(payload).await?;
     let resp = create_view(pool.get_ref(), params).await?;
@@ -29,25 +27,20 @@ pub async fn create_handler(
 pub async fn read_handler(
     payload: Payload,
     pool: Data<PgPool>,
+    doc_biz: Data<Arc<DocBiz>>,
 ) -> Result<HttpResponse, ServerError> {
     let params: QueryViewParams = parse_from_payload(payload).await?;
-    let resp = read_view(pool.get_ref(), params).await?;
+    let resp = read_view(pool.get_ref(), params, doc_biz).await?;
     Ok(resp.into())
 }
 
-pub async fn update_handler(
+pub async fn update_handler(payload: Payload, pool: Data<PgPool>) -> Result<HttpResponse, ServerError> {
-    payload: Payload,
-    pool: Data<PgPool>,
-) -> Result<HttpResponse, ServerError> {
     let params: UpdateViewParams = parse_from_payload(payload).await?;
     let resp = update_view(pool.get_ref(), params).await?;
     Ok(resp.into())
 }
 
-pub async fn delete_handler(
+pub async fn delete_handler(payload: Payload, pool: Data<PgPool>) -> Result<HttpResponse, ServerError> {
-    payload: Payload,
-    pool: Data<PgPool>,
-) -> Result<HttpResponse, ServerError> {
     let params: DeleteViewParams = parse_from_payload(payload).await?;
     let resp = delete_view(pool.get_ref(), &params.view_id).await?;
     Ok(resp.into())

backend/src/service/view/view.rs

@@ -18,11 +18,13 @@ use flowy_workspace::{
 use crate::{
     entities::workspace::{ViewTable, VIEW_TABLE},
     service::{
-        doc::{create_doc, delete_doc},
+        doc::{create_doc, delete_doc, doc::DocBiz},
         view::sql_builder::*,
     },
     sqlx_ext::{map_sqlx_error, DBTransaction, SqlBuilder},
 };
+use actix_web::web::Data;
+use std::sync::Arc;
 
 pub(crate) async fn create_view(pool: &PgPool, params: CreateViewParams) -> Result<FlowyResponse, ServerError> {
     let mut transaction = pool
@@ -67,7 +69,11 @@ pub(crate) async fn create_view_with_transaction(
     Ok(view)
 }
 
-pub(crate) async fn read_view(pool: &PgPool, params: QueryViewParams) -> Result<FlowyResponse, ServerError> {
+pub(crate) async fn read_view(
+    pool: &PgPool,
+    params: QueryViewParams,
+    _doc_biz: Data<Arc<DocBiz>>,
+) -> Result<FlowyResponse, ServerError> {
     let view_id = check_view_id(params.view_id)?;
     let mut transaction = pool
         .begin()

backend/src/service/ws/router.rs

@@ -1,7 +1,7 @@
 use crate::service::ws::{WsBizHandlers, WsClient, WsServer, WsUser};
 use actix::Addr;
 
-use crate::service::user::LoggedUser;
+use crate::{context::FlowyRuntime, service::user::LoggedUser};
 use actix_web::{
     get,
     web::{Data, Path, Payload},
@@ -17,12 +17,14 @@ pub async fn establish_ws_connection(
     payload: Payload,
     token: Path<String>,
     server: Data<Addr<WsServer>>,
+    runtime: Data<FlowyRuntime>,
     biz_handlers: Data<WsBizHandlers>,
 ) -> Result<HttpResponse, Error> {
+    log::info!("establish_ws_connection");
     match LoggedUser::from_token(token.clone()) {
         Ok(user) => {
             let ws_user = WsUser::new(user.clone());
-            let client = WsClient::new(ws_user, server.get_ref().clone(), biz_handlers);
+            let client = WsClient::new(ws_user, server.get_ref().clone(), biz_handlers, runtime);
             let result = ws::start(client, &request, payload);
             match result {
                 Ok(response) => Ok(response.into()),

backend/src/service/ws/ws_client.rs

@@ -1,5 +1,6 @@
 use crate::{
     config::{HEARTBEAT_INTERVAL, PING_TIMEOUT},
+    context::FlowyRuntime,
     service::{
         user::LoggedUser,
         ws::{
@@ -38,16 +39,23 @@ pub struct WsClient {
     user: Arc<WsUser>,
     server: Addr<WsServer>,
     biz_handlers: Data<WsBizHandlers>,
+    runtime: Data<FlowyRuntime>,
     hb: Instant,
 }
 
 impl WsClient {
-    pub fn new(user: WsUser, server: Addr<WsServer>, biz_handlers: Data<WsBizHandlers>) -> Self {
+    pub fn new(
+        user: WsUser,
+        server: Addr<WsServer>,
+        biz_handlers: Data<WsBizHandlers>,
+        runtime: Data<FlowyRuntime>,
+    ) -> Self {
         Self {
             user: Arc::new(user),
             server,
             biz_handlers,
             hb: Instant::now(),
+            runtime,
         }
     }
 
@@ -77,7 +85,7 @@ impl WsClient {
                     socket,
                     data: Bytes::from(message.data),
                 };
-                handler.receive_data(client_data)
+                handler.receive_data(client_data);
             },
         }
     }

backend/src/service/ws/ws_server.rs

@@ -46,9 +46,7 @@ impl Handler<Disconnect> for WsServer {
 impl Handler<WsMessageAdaptor> for WsServer {
     type Result = ();
 
-    fn handle(&mut self, _msg: WsMessageAdaptor, _ctx: &mut Context<Self>) -> Self::Result {
+    fn handle(&mut self, _msg: WsMessageAdaptor, _ctx: &mut Context<Self>) -> Self::Result { unimplemented!() }
-        unimplemented!()
-    }
 }
 
 impl actix::Supervised for WsServer {

backend/tests/document/edit.rs

@@ -3,5 +3,12 @@ use crate::document::helper::{DocScript, DocumentTest};
 #[actix_rt::test]
 async fn edit_doc_insert_text() {
     let test = DocumentTest::new().await;
-    test.run_scripts(vec![DocScript::SendText("abc")]).await;
+    test.run_scripts(vec![
+        DocScript::SendText(0, "abc"),
+        DocScript::SendText(3, "123"),
+        DocScript::SendText(6, "efg"),
+        DocScript::AssertClient(r#"[{"insert":"abc123efg\n"}]"#),
+        DocScript::AssertServer(r#"[{"insert":"abc123efg\n"}]"#),
+    ])
+    .await;
 }

backend/tests/document/helper.rs

@@ -1,32 +1,25 @@
 // use crate::helper::*;
 use crate::helper::{spawn_server, TestServer};
+
+use actix_web::web::Data;
 use flowy_document::{
-    entities::doc::{DocDelta, QueryDocParams},
+    entities::doc::QueryDocParams,
-    module::FlowyDocument,
+    services::doc::edit_doc_context::EditDocContext as ClientEditDocContext,
-    services::doc::edit_doc_context::EditDocContext,
 };
-
 use flowy_net::config::ServerConfig;
-use flowy_ot::core::Delta;
+use flowy_test::{workspace::ViewTest, FlowyTest};
-
+use std::sync::Arc;
-use flowy_test::{workspace::ViewTest, FlowyTest, FlowyTestSDK};
+use tokio::time::{sleep, Duration};
-use flowy_user::services::user::UserSession;
-
-use std::{str::FromStr, sync::Arc};
-use tokio::time::{interval, Duration};
 
 pub struct DocumentTest {
     server: TestServer,
     flowy_test: FlowyTest,
-    flowy_document: Arc<FlowyDocument>,
-    user_session: Arc<UserSession>,
-    edit_context: Arc<EditDocContext>,
 }
-
 #[derive(Clone)]
 pub enum DocScript {
-    SendText(&'static str),
+    SendText(usize, &'static str),
-    SendBinary(Vec<u8>),
+    AssertClient(&'static str),
+    AssertServer(&'static str),
 }
 
 impl DocumentTest {
@@ -34,46 +27,57 @@ impl DocumentTest {
         let server = spawn_server().await;
         let server_config = ServerConfig::new(&server.host, "http", "ws");
         let flowy_test = FlowyTest::setup_with(server_config);
-
+        Self { server, flowy_test }
-        init_user(&flowy_test).await;
-
-        let edit_context = create_doc(&flowy_test).await;
-        let user_session = flowy_test.sdk.user_session.clone();
-        let flowy_document = flowy_test.sdk.flowy_document.clone();
-        Self {
-            server,
-            flowy_test,
-            flowy_document,
-            user_session,
-            edit_context,
-        }
     }
 
     pub async fn run_scripts(self, scripts: Vec<DocScript>) {
-        for script in scripts {
+        init_user(&self.flowy_test).await;
-            match script {
+        let DocumentTest { server, flowy_test } = self;
-                DocScript::SendText(s) => {
+        run_scripts(server, flowy_test, scripts).await;
-                    let delta = Delta::from_str(s).unwrap();
+        sleep(Duration::from_secs(5)).await;
-                    let data = delta.to_json();
-                    let doc_delta = DocDelta {
-                        doc_id: self.edit_context.doc_id.clone(),
-                        data,
-                    };
-
-                    self.flowy_document.apply_doc_delta(doc_delta).await;
-                },
-                DocScript::SendBinary(_bytes) => {},
-            }
-        }
-        std::mem::forget(self);
-
-        let mut interval = interval(Duration::from_secs(5));
-        interval.tick().await;
-        interval.tick().await;
     }
 }
 
-async fn create_doc(flowy_test: &FlowyTest) -> Arc<EditDocContext> {
+pub async fn run_scripts(server: TestServer, flowy_test: FlowyTest, scripts: Vec<DocScript>) {
+    let client_edit_context = create_doc(&flowy_test).await;
+    let doc_id = client_edit_context.doc_id.clone();
+    for script in scripts {
+        match script {
+            DocScript::SendText(index, s) => {
+                client_edit_context.insert(index, s);
+            },
+            DocScript::AssertClient(s) => {
+                let json = client_edit_context.doc_json();
+                assert_eq(s, &json);
+            },
+            DocScript::AssertServer(s) => {
+                sleep(Duration::from_millis(100)).await;
+                let pool = server.pg_pool.clone();
+                let edit_context = server
+                    .app_ctx
+                    .doc_biz
+                    .manager
+                    .get(&doc_id, Data::new(pool))
+                    .await
+                    .unwrap()
+                    .unwrap();
+                let json = edit_context.doc_json();
+                assert_eq(s, &json);
+            },
+        }
+    }
+    std::mem::forget(flowy_test);
+}
+
+fn assert_eq(expect: &str, receive: &str) {
+    if expect != receive {
+        log::error!("expect: {}", expect);
+        log::error!("but receive: {}", receive);
+    }
+    assert_eq!(expect, receive);
+}
+
+async fn create_doc(flowy_test: &FlowyTest) -> Arc<ClientEditDocContext> {
     let view_test = ViewTest::new(flowy_test).await;
     let doc_id = view_test.view.id.clone();
     let user_session = flowy_test.sdk.user_session.clone();

backend/tests/helper.rs

@@ -1,8 +1,10 @@
 use backend::{
     application::{get_connection_pool, Application},
     config::{get_configuration, DatabaseSettings},
+    context::AppContext,
 };
 
+use backend::application::init_app_context;
 use flowy_document::{
     entities::doc::{Doc, QueryDocParams},
     prelude::*,
@@ -168,6 +170,7 @@ pub struct TestServer {
     pub host: String,
     pub port: u16,
     pub pg_pool: PgPool,
+    pub app_ctx: AppContext,
 }
 
 pub async fn spawn_server() -> TestServer {
@@ -181,7 +184,8 @@ pub async fn spawn_server() -> TestServer {
     };
 
     let _ = configure_database(&configuration.database).await;
-    let application = Application::build(configuration.clone())
+    let app_ctx = init_app_context(&configuration).await;
+    let application = Application::build(configuration.clone(), app_ctx.clone())
         .await
         .expect("Failed to build application.");
     let application_port = application.port();
@@ -197,6 +201,7 @@ pub async fn spawn_server() -> TestServer {
         pg_pool: get_connection_pool(&configuration.database)
             .await
             .expect("Failed to connect to the database"),
+        app_ctx,
     }
 }
 

rust-lib/flowy-document/Cargo.toml

@@ -49,4 +49,5 @@ env_logger = "0.8.2"
 
 
 [features]
-http_server = []
+http_server = []
+flowy_test = []

rust-lib/flowy-document/src/entities/doc/revision.rs

@@ -1,3 +1,4 @@
+use crate::services::util::md5;
 use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
 
 #[derive(Debug, ProtoBuf_Enum, Clone, Eq, PartialEq)]
@@ -19,7 +20,7 @@ pub struct Revision {
     pub rev_id: i64,
 
     #[pb(index = 3)]
-    pub delta: Vec<u8>,
+    pub delta_data: Vec<u8>,
 
     #[pb(index = 4)]
     pub md5: String,
@@ -32,11 +33,13 @@ pub struct Revision {
 }
 
 impl Revision {
-    pub fn new(base_rev_id: i64, rev_id: i64, delta: Vec<u8>, md5: String, doc_id: String, ty: RevType) -> Revision {
+    pub fn new(base_rev_id: i64, rev_id: i64, delta_data: Vec<u8>, doc_id: &str, ty: RevType) -> Revision {
+        let md5 = md5(&delta_data);
+        let doc_id = doc_id.to_owned();
         Self {
             base_rev_id,
             rev_id,
-            delta,
+            delta_data,
             md5,
             doc_id,
             ty,

rust-lib/flowy-document/src/protobuf/model/revision.rs

@@ -28,7 +28,7 @@ pub struct Revision {
     // message fields
     pub base_rev_id: i64,
     pub rev_id: i64,
-    pub delta: ::std::vec::Vec<u8>,
+    pub delta_data: ::std::vec::Vec<u8>,
     pub md5: ::std::string::String,
     pub doc_id: ::std::string::String,
     pub ty: RevType,
@@ -78,30 +78,30 @@ impl Revision {
         self.rev_id = v;
     }
 
-    // bytes delta = 3;
+    // bytes delta_data = 3;
 
 
-    pub fn get_delta(&self) -> &[u8] {
+    pub fn get_delta_data(&self) -> &[u8] {
-        &self.delta
+        &self.delta_data
     }
-    pub fn clear_delta(&mut self) {
+    pub fn clear_delta_data(&mut self) {
-        self.delta.clear();
+        self.delta_data.clear();
     }
 
     // Param is passed by value, moved
-    pub fn set_delta(&mut self, v: ::std::vec::Vec<u8>) {
+    pub fn set_delta_data(&mut self, v: ::std::vec::Vec<u8>) {
-        self.delta = v;
+        self.delta_data = v;
     }
 
     // Mutable pointer to the field.
     // If field is not initialized, it is initialized with default value first.
-    pub fn mut_delta(&mut self) -> &mut ::std::vec::Vec<u8> {
+    pub fn mut_delta_data(&mut self) -> &mut ::std::vec::Vec<u8> {
-        &mut self.delta
+        &mut self.delta_data
     }
 
     // Take field
-    pub fn take_delta(&mut self) -> ::std::vec::Vec<u8> {
+    pub fn take_delta_data(&mut self) -> ::std::vec::Vec<u8> {
-        ::std::mem::replace(&mut self.delta, ::std::vec::Vec::new())
+        ::std::mem::replace(&mut self.delta_data, ::std::vec::Vec::new())
     }
 
     // string md5 = 4;
@@ -196,7 +196,7 @@ impl ::protobuf::Message for Revision {
                     self.rev_id = tmp;
                 },
                 3 => {
-                    ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.delta)?;
+                    ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.delta_data)?;
                 },
                 4 => {
                     ::protobuf::rt::read_singular_proto3_string_into(wire_type, is, &mut self.md5)?;
@@ -225,8 +225,8 @@ impl ::protobuf::Message for Revision {
         if self.rev_id != 0 {
             my_size += ::protobuf::rt::value_size(2, self.rev_id, ::protobuf::wire_format::WireTypeVarint);
         }
-        if !self.delta.is_empty() {
+        if !self.delta_data.is_empty() {
-            my_size += ::protobuf::rt::bytes_size(3, &self.delta);
+            my_size += ::protobuf::rt::bytes_size(3, &self.delta_data);
         }
         if !self.md5.is_empty() {
             my_size += ::protobuf::rt::string_size(4, &self.md5);
@@ -249,8 +249,8 @@ impl ::protobuf::Message for Revision {
         if self.rev_id != 0 {
             os.write_int64(2, self.rev_id)?;
         }
-        if !self.delta.is_empty() {
+        if !self.delta_data.is_empty() {
-            os.write_bytes(3, &self.delta)?;
+            os.write_bytes(3, &self.delta_data)?;
         }
         if !self.md5.is_empty() {
             os.write_string(4, &self.md5)?;
@@ -310,9 +310,9 @@ impl ::protobuf::Message for Revision {
                 |m: &mut Revision| { &mut m.rev_id },
             ));
             fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>(
-                "delta",
+                "delta_data",
-                |m: &Revision| { &m.delta },
+                |m: &Revision| { &m.delta_data },
-                |m: &mut Revision| { &mut m.delta },
+                |m: &mut Revision| { &mut m.delta_data },
             ));
             fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeString>(
                 "md5",
@@ -347,7 +347,7 @@ impl ::protobuf::Clear for Revision {
     fn clear(&mut self) {
         self.base_rev_id = 0;
         self.rev_id = 0;
-        self.delta.clear();
+        self.delta_data.clear();
         self.md5.clear();
         self.doc_id.clear();
         self.ty = RevType::Local;
@@ -647,39 +647,39 @@ impl ::protobuf::reflect::ProtobufValue for RevType {
 }
 
 static file_descriptor_proto_data: &'static [u8] = b"\
-    \n\x0erevision.proto\"\x9a\x01\n\x08Revision\x12\x1e\n\x0bbase_rev_id\
+    \n\x0erevision.proto\"\xa3\x01\n\x08Revision\x12\x1e\n\x0bbase_rev_id\
     \x18\x01\x20\x01(\x03R\tbaseRevId\x12\x15\n\x06rev_id\x18\x02\x20\x01(\
-    \x03R\x05revId\x12\x14\n\x05delta\x18\x03\x20\x01(\x0cR\x05delta\x12\x10\
+    \x03R\x05revId\x12\x1d\n\ndelta_data\x18\x03\x20\x01(\x0cR\tdeltaData\
-    \n\x03md5\x18\x04\x20\x01(\tR\x03md5\x12\x15\n\x06doc_id\x18\x05\x20\x01\
+    \x12\x10\n\x03md5\x18\x04\x20\x01(\tR\x03md5\x12\x15\n\x06doc_id\x18\x05\
-    (\tR\x05docId\x12\x18\n\x02ty\x18\x06\x20\x01(\x0e2\x08.RevTypeR\x02ty\"\
+    \x20\x01(\tR\x05docId\x12\x18\n\x02ty\x18\x06\x20\x01(\x0e2\x08.RevTypeR\
-    b\n\rRevisionRange\x12\x15\n\x06doc_id\x18\x01\x20\x01(\tR\x05docId\x12\
+    \x02ty\"b\n\rRevisionRange\x12\x15\n\x06doc_id\x18\x01\x20\x01(\tR\x05do\
-    \x1e\n\x0bfrom_rev_id\x18\x02\x20\x01(\x03R\tfromRevId\x12\x1a\n\tto_rev\
+    cId\x12\x1e\n\x0bfrom_rev_id\x18\x02\x20\x01(\x03R\tfromRevId\x12\x1a\n\
-    _id\x18\x03\x20\x01(\x03R\x07toRevId*\x20\n\x07RevType\x12\t\n\x05Local\
+    \tto_rev_id\x18\x03\x20\x01(\x03R\x07toRevId*\x20\n\x07RevType\x12\t\n\
-    \x10\0\x12\n\n\x06Remote\x10\x01J\x9b\x05\n\x06\x12\x04\0\0\x12\x01\n\
+    \x05Local\x10\0\x12\n\n\x06Remote\x10\x01J\x9b\x05\n\x06\x12\x04\0\0\x12\
-    \x08\n\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x04\0\x12\x04\x02\0\t\x01\n\n\n\
+    \x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\n\x02\x04\0\x12\x04\x02\0\t\x01\
-    \x03\x04\0\x01\x12\x03\x02\x08\x10\n\x0b\n\x04\x04\0\x02\0\x12\x03\x03\
+    \n\n\n\x03\x04\0\x01\x12\x03\x02\x08\x10\n\x0b\n\x04\x04\0\x02\0\x12\x03\
-    \x04\x1a\n\x0c\n\x05\x04\0\x02\0\x05\x12\x03\x03\x04\t\n\x0c\n\x05\x04\0\
+    \x03\x04\x1a\n\x0c\n\x05\x04\0\x02\0\x05\x12\x03\x03\x04\t\n\x0c\n\x05\
-    \x02\0\x01\x12\x03\x03\n\x15\n\x0c\n\x05\x04\0\x02\0\x03\x12\x03\x03\x18\
+    \x04\0\x02\0\x01\x12\x03\x03\n\x15\n\x0c\n\x05\x04\0\x02\0\x03\x12\x03\
-    \x19\n\x0b\n\x04\x04\0\x02\x01\x12\x03\x04\x04\x15\n\x0c\n\x05\x04\0\x02\
+    \x03\x18\x19\n\x0b\n\x04\x04\0\x02\x01\x12\x03\x04\x04\x15\n\x0c\n\x05\
-    \x01\x05\x12\x03\x04\x04\t\n\x0c\n\x05\x04\0\x02\x01\x01\x12\x03\x04\n\
+    \x04\0\x02\x01\x05\x12\x03\x04\x04\t\n\x0c\n\x05\x04\0\x02\x01\x01\x12\
-    \x10\n\x0c\n\x05\x04\0\x02\x01\x03\x12\x03\x04\x13\x14\n\x0b\n\x04\x04\0\
+    \x03\x04\n\x10\n\x0c\n\x05\x04\0\x02\x01\x03\x12\x03\x04\x13\x14\n\x0b\n\
-    \x02\x02\x12\x03\x05\x04\x14\n\x0c\n\x05\x04\0\x02\x02\x05\x12\x03\x05\
+    \x04\x04\0\x02\x02\x12\x03\x05\x04\x19\n\x0c\n\x05\x04\0\x02\x02\x05\x12\
-    \x04\t\n\x0c\n\x05\x04\0\x02\x02\x01\x12\x03\x05\n\x0f\n\x0c\n\x05\x04\0\
+    \x03\x05\x04\t\n\x0c\n\x05\x04\0\x02\x02\x01\x12\x03\x05\n\x14\n\x0c\n\
-    \x02\x02\x03\x12\x03\x05\x12\x13\n\x0b\n\x04\x04\0\x02\x03\x12\x03\x06\
+    \x05\x04\0\x02\x02\x03\x12\x03\x05\x17\x18\n\x0b\n\x04\x04\0\x02\x03\x12\
-    \x04\x13\n\x0c\n\x05\x04\0\x02\x03\x05\x12\x03\x06\x04\n\n\x0c\n\x05\x04\
+    \x03\x06\x04\x13\n\x0c\n\x05\x04\0\x02\x03\x05\x12\x03\x06\x04\n\n\x0c\n\
-    \0\x02\x03\x01\x12\x03\x06\x0b\x0e\n\x0c\n\x05\x04\0\x02\x03\x03\x12\x03\
+    \x05\x04\0\x02\x03\x01\x12\x03\x06\x0b\x0e\n\x0c\n\x05\x04\0\x02\x03\x03\
-    \x06\x11\x12\n\x0b\n\x04\x04\0\x02\x04\x12\x03\x07\x04\x16\n\x0c\n\x05\
+    \x12\x03\x06\x11\x12\n\x0b\n\x04\x04\0\x02\x04\x12\x03\x07\x04\x16\n\x0c\
-    \x04\0\x02\x04\x05\x12\x03\x07\x04\n\n\x0c\n\x05\x04\0\x02\x04\x01\x12\
+    \n\x05\x04\0\x02\x04\x05\x12\x03\x07\x04\n\n\x0c\n\x05\x04\0\x02\x04\x01\
-    \x03\x07\x0b\x11\n\x0c\n\x05\x04\0\x02\x04\x03\x12\x03\x07\x14\x15\n\x0b\
+    \x12\x03\x07\x0b\x11\n\x0c\n\x05\x04\0\x02\x04\x03\x12\x03\x07\x14\x15\n\
-    \n\x04\x04\0\x02\x05\x12\x03\x08\x04\x13\n\x0c\n\x05\x04\0\x02\x05\x06\
+    \x0b\n\x04\x04\0\x02\x05\x12\x03\x08\x04\x13\n\x0c\n\x05\x04\0\x02\x05\
-    \x12\x03\x08\x04\x0b\n\x0c\n\x05\x04\0\x02\x05\x01\x12\x03\x08\x0c\x0e\n\
+    \x06\x12\x03\x08\x04\x0b\n\x0c\n\x05\x04\0\x02\x05\x01\x12\x03\x08\x0c\
-    \x0c\n\x05\x04\0\x02\x05\x03\x12\x03\x08\x11\x12\n\n\n\x02\x04\x01\x12\
+    \x0e\n\x0c\n\x05\x04\0\x02\x05\x03\x12\x03\x08\x11\x12\n\n\n\x02\x04\x01\
-    \x04\n\0\x0e\x01\n\n\n\x03\x04\x01\x01\x12\x03\n\x08\x15\n\x0b\n\x04\x04\
+    \x12\x04\n\0\x0e\x01\n\n\n\x03\x04\x01\x01\x12\x03\n\x08\x15\n\x0b\n\x04\
-    \x01\x02\0\x12\x03\x0b\x04\x16\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03\x0b\
+    \x04\x01\x02\0\x12\x03\x0b\x04\x16\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03\
-    \x04\n\n\x0c\n\x05\x04\x01\x02\0\x01\x12\x03\x0b\x0b\x11\n\x0c\n\x05\x04\
+    \x0b\x04\n\n\x0c\n\x05\x04\x01\x02\0\x01\x12\x03\x0b\x0b\x11\n\x0c\n\x05\
-    \x01\x02\0\x03\x12\x03\x0b\x14\x15\n\x0b\n\x04\x04\x01\x02\x01\x12\x03\
+    \x04\x01\x02\0\x03\x12\x03\x0b\x14\x15\n\x0b\n\x04\x04\x01\x02\x01\x12\
-    \x0c\x04\x1a\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03\x0c\x04\t\n\x0c\n\
+    \x03\x0c\x04\x1a\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03\x0c\x04\t\n\x0c\
-    \x05\x04\x01\x02\x01\x01\x12\x03\x0c\n\x15\n\x0c\n\x05\x04\x01\x02\x01\
+    \n\x05\x04\x01\x02\x01\x01\x12\x03\x0c\n\x15\n\x0c\n\x05\x04\x01\x02\x01\
     \x03\x12\x03\x0c\x18\x19\n\x0b\n\x04\x04\x01\x02\x02\x12\x03\r\x04\x18\n\
     \x0c\n\x05\x04\x01\x02\x02\x05\x12\x03\r\x04\t\n\x0c\n\x05\x04\x01\x02\
     \x02\x01\x12\x03\r\n\x13\n\x0c\n\x05\x04\x01\x02\x02\x03\x12\x03\r\x16\

rust-lib/flowy-document/src/protobuf/proto/revision.proto

@@ -3,7 +3,7 @@ syntax = "proto3";
 message Revision {
     int64 base_rev_id = 1;
     int64 rev_id = 2;
-    bytes delta = 3;
+    bytes delta_data = 3;
     string md5 = 4;
     string doc_id = 5;
     RevType ty = 6;

rust-lib/flowy-document/src/services/doc/document/data.rs

@@ -1,18 +1,10 @@
-use crate::{errors::DocError, services::doc::DocumentData};
 use serde::{Deserialize, Serialize};
 
-impl<T: AsRef<str>> DocumentData for T {
-    fn into_string(self) -> Result<String, DocError> { Ok(self.as_ref().to_string()) }
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ImageData {
     image: String,
 }
 
-impl DocumentData for ImageData {
+impl ToString for ImageData {
-    fn into_string(self) -> Result<String, DocError> {
+    fn to_string(&self) -> String { self.image.clone() }
-        let s = serde_json::to_string(&self)?;
-        Ok(s)
-    }
 }

rust-lib/flowy-document/src/services/doc/document/document.rs

@@ -5,10 +5,6 @@ use crate::{
 
 use flowy_ot::core::*;
 
-pub trait DocumentData {
-    fn into_string(self) -> Result<String, DocError>;
-}
-
 pub trait CustomDocument {
     fn init_delta() -> Delta;
 }
@@ -49,7 +45,7 @@ impl Document {
 
     pub fn to_json(&self) -> String { self.delta.to_json() }
 
-    pub fn to_bytes(&self) -> Vec<u8> { self.delta.clone().into_bytes() }
+    pub fn to_bytes(&self) -> Vec<u8> { self.delta.clone().to_bytes().to_vec() }
 
     pub fn to_plain_string(&self) -> String { self.delta.apply("").unwrap() }
 
@@ -83,11 +79,11 @@ impl Document {
         Ok(())
     }
 
-    pub fn insert<T: DocumentData>(&mut self, index: usize, data: T) -> Result<Delta, DocError> {
+    pub fn insert<T: ToString>(&mut self, index: usize, data: T) -> Result<Delta, DocError> {
         let interval = Interval::new(index, index);
         let _ = validate_interval(&self.delta, &interval)?;
 
-        let text = data.into_string()?;
+        let text = data.to_string();
         let delta = self.view.insert(&self.delta, &text, interval)?;
         log::trace!("👉 receive change: {}", delta);
         self.compose_delta(&delta)?;
@@ -115,10 +111,10 @@ impl Document {
         Ok(format_delta)
     }
 
-    pub fn replace<T: DocumentData>(&mut self, interval: Interval, data: T) -> Result<Delta, DocError> {
+    pub fn replace<T: ToString>(&mut self, interval: Interval, data: T) -> Result<Delta, DocError> {
         let _ = validate_interval(&self.delta, &interval)?;
         let mut delta = Delta::default();
-        let text = data.into_string()?;
+        let text = data.to_string();
         if !text.is_empty() {
             delta = self.view.insert(&self.delta, &text, interval)?;
             log::trace!("👉 receive change: {}", delta);

rust-lib/flowy-document/src/services/doc/edit_doc_context.rs

@@ -1,24 +1,19 @@
 use crate::{
     entities::{
-        doc::{Doc, Revision},
+        doc::{Doc, RevType, Revision, RevisionRange},
         ws::{WsDataType, WsDocumentData},
     },
     errors::*,
     services::{
-        doc::{rev_manager::RevisionManager, Document},
+        doc::{rev_manager::RevisionManager, Document, UndoResult},
-        util::{bytes_to_rev_id, md5},
+        util::bytes_to_rev_id,
-        ws::WsDocumentHandler,
+        ws::{WsDocumentHandler, WsDocumentSender},
     },
-};
-use bytes::Bytes;
-
-use crate::{
-    entities::doc::{RevType, RevisionRange},
-    services::ws::WsDocumentSender,
     sql_tables::{doc::DocTableSql, DocTableChangeset},
 };
+use bytes::Bytes;
 use flowy_database::ConnectionPool;
-use flowy_ot::core::Delta;
+use flowy_ot::core::{Attribute, Delta, Interval};
 use parking_lot::RwLock;
 use std::{convert::TryFrom, sync::Arc};
 
@@ -49,6 +44,38 @@ impl EditDocContext {
         Ok(edit_context)
     }
 
+    pub fn insert<T: ToString>(&self, index: usize, data: T) -> Result<(), DocError> {
+        let delta_data = self.document.write().insert(index, data)?.to_bytes();
+        let _ = self.mk_revision(&delta_data)?;
+        Ok(())
+    }
+
+    pub fn delete(&self, interval: Interval) -> Result<(), DocError> {
+        let delta_data = self.document.write().delete(interval)?.to_bytes();
+        let _ = self.mk_revision(&delta_data)?;
+        Ok(())
+    }
+
+    pub fn format(&self, interval: Interval, attribute: Attribute) -> Result<(), DocError> {
+        let delta_data = self.document.write().format(interval, attribute)?.to_bytes();
+        let _ = self.mk_revision(&delta_data)?;
+        Ok(())
+    }
+
+    pub fn replace<T: ToString>(&mut self, interval: Interval, data: T) -> Result<(), DocError> {
+        let delta_data = self.document.write().replace(interval, data)?.to_bytes();
+        let _ = self.mk_revision(&delta_data)?;
+        Ok(())
+    }
+
+    pub fn can_undo(&self) -> bool { self.document.read().can_undo() }
+
+    pub fn can_redo(&self) -> bool { self.document.read().can_redo() }
+
+    pub fn undo(&self) -> Result<UndoResult, DocError> { self.document.write().undo() }
+
+    pub fn redo(&self) -> Result<UndoResult, DocError> { self.document.write().redo() }
+
     pub fn doc(&self) -> Doc {
         Doc {
             id: self.doc_id.clone(),
@@ -57,50 +84,54 @@ impl EditDocContext {
         }
     }
 
-    #[tracing::instrument(level = "debug", skip(self, data), err)]
+    fn mk_revision(&self, delta_data: &Bytes) -> Result<(), DocError> {
-    pub(crate) fn compose_local_delta(&self, data: Bytes) -> Result<(), DocError> {
         let (base_rev_id, rev_id) = self.rev_manager.next_rev_id();
-        let revision = Revision::new(
+        let delta_data = delta_data.to_vec();
-            base_rev_id,
+        let revision = Revision::new(base_rev_id, rev_id, delta_data, &self.doc_id, RevType::Local);
-            rev_id,
+        let _ = self.save_to_disk(revision.rev_id)?;
-            data.to_vec(),
-            md5(&data),
-            self.doc_id.clone(),
-            RevType::Local,
-        );
-
-        let _ = self.update_document(&revision)?;
         let _ = self.rev_manager.add_revision(revision)?;
         Ok(())
     }
 
-    #[tracing::instrument(level = "debug", skip(self, revision), err)]
+    #[tracing::instrument(level = "debug", skip(self, data), err)]
-    pub fn update_document(&self, revision: &Revision) -> Result<(), DocError> {
+    pub(crate) fn compose_local_delta(&self, data: Bytes) -> Result<(), DocError> {
-        let delta = Delta::from_bytes(&revision.delta)?;
+        let delta = Delta::from_bytes(&data)?;
         self.document.write().compose_delta(&delta)?;
-        let data = self.document.read().to_json();
-        let changeset = DocTableChangeset {
-            id: self.doc_id.clone(),
-            data,
-            rev_id: revision.rev_id,
-        };
 
-        let sql = DocTableSql {};
+        let _ = self.mk_revision(&data)?;
-        let conn = self.pool.get().map_err(internal_error)?;
-        let _ = sql.update_doc_table(changeset, &*conn)?;
         Ok(())
     }
 
     #[tracing::instrument(level = "debug", skip(self), err)]
     fn compose_remote_delta(&self) -> Result<(), DocError> {
         self.rev_manager.next_compose_revision(|revision| {
-            let _ = self.update_document(revision)?;
+            let delta = Delta::from_bytes(&revision.delta_data)?;
+            self.document.write().compose_delta(&delta)?;
+            let _ = self.save_to_disk(revision.rev_id)?;
+
             log::debug!("😁Document: {:?}", self.document.read().to_plain_string());
             Ok(())
         });
         Ok(())
     }
 
+    #[cfg(feature = "flowy_test")]
+    pub fn doc_json(&self) -> String { self.document.read().to_json() }
+
+    #[tracing::instrument(level = "debug", skip(self, rev_id), err)]
+    fn save_to_disk(&self, rev_id: i64) -> Result<(), DocError> {
+        let data = self.document.read().to_json();
+        let changeset = DocTableChangeset {
+            id: self.doc_id.clone(),
+            data,
+            rev_id,
+        };
+        let sql = DocTableSql {};
+        let conn = self.pool.get().map_err(internal_error)?;
+        let _ = sql.update_doc_table(changeset, &*conn)?;
+        Ok(())
+    }
+
     // #[tracing::instrument(level = "debug", skip(self, params), err)]
     // fn update_doc_on_server(&self, params: UpdateDocParams) -> Result<(),
     //     DocError> {     let token = self.user.token()?;

rust-lib/flowy-document/src/services/doc/rev_manager.rs

@@ -80,7 +80,7 @@ impl RevisionManager {
     }
 
     pub fn ack(&self, rev_id: i64) -> Result<(), DocError> {
-        log::debug!("Receive {} acked", rev_id);
+        log::debug!("Receive rev_id: {} acked", rev_id);
         self.ack_rev_cache.insert(rev_id);
         self.update_revisions();
         Ok(())

rust-lib/flowy-document/src/sql_tables/doc/doc_op_sql.rs

@@ -28,7 +28,7 @@ impl OpTableSql {
                     doc_id.eq(revision.doc_id),
                     base_rev_id.eq(revision.base_rev_id),
                     rev_id.eq(revision.rev_id),
-                    data.eq(revision.delta),
+                    data.eq(revision.delta_data),
                     state.eq(new_state),
                     ty.eq(rev_ty),
                 )

rust-lib/flowy-document/src/sql_tables/doc/doc_op_table.rs

@@ -52,7 +52,7 @@ impl std::convert::Into<Revision> for RevTable {
         Revision {
             base_rev_id: self.base_rev_id,
             rev_id: self.rev_id,
-            delta: self.data,
+            delta_data: self.data,
             md5,
             doc_id: self.doc_id,
             ty: self.ty.into(),

rust-lib/flowy-document/src/sql_tables/mod.rs

@@ -1,3 +1,3 @@
 pub(crate) mod doc;
 
-pub use doc::*;
+pub(crate) use doc::*;

rust-lib/flowy-log/src/lib.rs

@@ -44,7 +44,7 @@ impl Builder {
             .with_target(false)
             .with_max_level(tracing::Level::TRACE)
             .with_writer(std::io::stderr)
-            .with_thread_ids(false)
+            .with_thread_ids(true)
             // .with_writer(non_blocking)
             // .json()
             .compact()
@@ -60,7 +60,8 @@ impl Builder {
         // }
 
         let formatting_layer = FlowyFormattingLayer::new(std::io::stdout);
-        let _ = set_global_default(subscriber.with(JsonStorageLayer).with(formatting_layer)).map_err(|e| format!("{:?}", e))?;
+        let _ = set_global_default(subscriber.with(JsonStorageLayer).with(formatting_layer))
+            .map_err(|e| format!("{:?}", e))?;
 
         let _ = LogTracer::builder()
             .with_max_level(LevelFilter::Trace)

rust-lib/flowy-net/src/errors.rs

@@ -5,6 +5,8 @@ use std::{fmt, fmt::Debug};
 
 use crate::response::FlowyResponse;
 
+pub type Result<T> = std::result::Result<T, ServerError>;
+
 #[derive(thiserror::Error, Debug, Serialize, Deserialize, Clone)]
 pub struct ServerError {
     pub code: ErrorCode,

rust-lib/flowy-ot/src/core/delta/delta.rs

@@ -51,10 +51,6 @@ impl std::convert::TryFrom<Bytes> for Delta {
     fn try_from(bytes: Bytes) -> Result<Self, Self::Error> { Delta::from_bytes(&bytes) }
 }
 
-// impl<T: AsRef<Vec<u8>>> std::convert::From<T> for Delta {
-//     fn from(bytes: T) -> Self {
-// Delta::from_bytes(bytes.as_ref().to_vec()).unwrap() } }
-
 impl fmt::Display for Delta {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // f.write_str(&serde_json::to_string(self).unwrap_or("".to_owned()))?;
@@ -96,9 +92,9 @@ impl Delta {
         Self::from_json(json)
     }
 
-    pub fn into_bytes(self) -> Vec<u8> {
+    pub fn to_bytes(&self) -> Bytes {
         let json = self.to_json();
-        json.into_bytes()
+        Bytes::from(json.into_bytes())
     }
 
     #[inline]

rust-lib/flowy-sdk/src/lib.rs

@@ -96,7 +96,7 @@ fn init_log(config: &FlowySDKConfig) {
     if !INIT_LOG.load(Ordering::SeqCst) {
         INIT_LOG.store(true, Ordering::SeqCst);
 
-        let _ = flowy_log::Builder::new("flowy")
+        let _ = flowy_log::Builder::new("flowy-client")
             .local(&config.root)
             .env_filter(&config.log_filter)
             .build();

rust-lib/flowy-user/src/services/user/user_session.rs

@@ -295,6 +295,7 @@ impl UserSession {
     }
 
     fn start_ws_connection(&self, token: &str) -> Result<(), UserError> {
+        log::debug!("start_ws_connection");
         let addr = format!("{}/{}", self.server.ws_addr(), token);
         let ws_controller = self.ws_controller.clone();
         let retry = Retry::new(&addr, move |addr| {