Extract protobuf structs from flowy-sync crate (#1425)

* refactor: extract data model from flowy-sync crate

* chore: rename lib-infra features

Author: appflowy

frontend/rust-lib/Cargo.lock

@@ -38,6 +38,5 @@ openssl_vendored = ["flowy-sdk/openssl_vendored"]
 
 [build-dependencies]
 lib-infra = { path = "../../../shared-lib/lib-infra", features = [
-    "protobuf_file_gen",
     "dart",
 ] }

frontend/rust-lib/dart-ffi/Cargo.toml

@@ -19,4 +19,4 @@ lib-dispatch = {path = "../lib-dispatch" }
 dart = ["lib-infra/dart"]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["proto_gen"] }

frontend/rust-lib/dart-notify/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 
 [dependencies]
 flowy-sync = { path = "../../../shared-lib/flowy-sync"}
+flowy-http-model = { path = "../../../shared-lib/flowy-http-model"}
 flowy-derive = { path = "../../../shared-lib/flowy-derive" }
 lib-ot = { path = "../../../shared-lib/lib-ot" }
 lib-ws = { path = "../../../shared-lib/lib-ws" }
@@ -51,7 +52,7 @@ criterion = "0.3"
 rand = "0.8.5"
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen", "proto_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = [ "proto_gen"] }
 
 [features]
 sync = []

frontend/rust-lib/flowy-document/Cargo.toml

@@ -1,7 +1,7 @@
 use bytes::Bytes;
 use flowy_error::{FlowyError, FlowyResult};
+use flowy_http_model::revision::Revision;
 use flowy_revision::{RevisionMergeable, RevisionObjectDeserializer, RevisionObjectSerializer};
-use flowy_sync::entities::revision::Revision;
 use lib_ot::core::{Extension, NodeDataBuilder, NodeOperation, NodeTree, NodeTreeContext, Selection, Transaction};
 use lib_ot::text_delta::DeltaTextOperationBuilder;
 

frontend/rust-lib/flowy-document/src/editor/document.rs

@@ -6,8 +6,8 @@ use crate::{DocumentEditor, DocumentUser};
 use bytes::Bytes;
 use flowy_database::ConnectionPool;
 use flowy_error::{internal_error, FlowyError, FlowyResult};
+use flowy_http_model::ws_data::ServerRevisionWSData;
 use flowy_revision::{RevisionCloudService, RevisionManager};
-use flowy_sync::entities::ws_data::ServerRevisionWSData;
 use lib_infra::future::FutureResult;
 use lib_ot::core::Transaction;
 use lib_ws::WSConnectState;

frontend/rust-lib/flowy-document/src/editor/editor.rs

@@ -3,8 +3,8 @@ use crate::DocumentUser;
 use async_stream::stream;
 use bytes::Bytes;
 use flowy_error::FlowyError;
+use flowy_http_model::revision::{RevId, Revision};
 use flowy_revision::RevisionManager;
-use flowy_sync::entities::revision::{RevId, Revision};
 use futures::stream::StreamExt;
 use lib_ot::core::Transaction;
 

frontend/rust-lib/flowy-document/src/editor/queue.rs

@@ -16,7 +16,7 @@ pub mod errors {
 pub const TEXT_BLOCK_SYNC_INTERVAL_IN_MILLIS: u64 = 1000;
 
 use crate::errors::FlowyError;
-use flowy_sync::entities::document::{CreateDocumentParams, DocumentIdPB, DocumentPayloadPB, ResetDocumentParams};
+use flowy_http_model::document::{CreateDocumentParams, DocumentIdPB, DocumentPayloadPB, ResetDocumentParams};
 use lib_infra::future::FutureResult;
 
 pub trait DocumentCloudService: Send + Sync {

frontend/rust-lib/flowy-document/src/lib.rs

@@ -8,13 +8,13 @@ use bytes::Bytes;
 
 use flowy_database::ConnectionPool;
 use flowy_error::FlowyResult;
+use flowy_http_model::util::md5;
+use flowy_http_model::{document::DocumentIdPB, revision::Revision, ws_data::ServerRevisionWSData};
 use flowy_revision::{
     RevisionCloudService, RevisionManager, RevisionPersistence, RevisionPersistenceConfiguration, RevisionWebSocket,
     SQLiteRevisionSnapshotPersistence,
 };
 use flowy_sync::client_document::initial_delta_document_content;
-use flowy_sync::entities::{document::DocumentIdPB, revision::Revision, ws_data::ServerRevisionWSData};
-use flowy_sync::util::md5;
 use lib_infra::future::FutureResult;
 use lib_infra::ref_map::{RefCountHashMap, RefCountValue};
 use lib_ws::WSConnectState;
@@ -307,7 +307,7 @@ impl RevisionCloudService for DocumentRevisionCloudService {
             match server.fetch_document(&token, params).await? {
                 None => Err(FlowyError::record_not_found().context("Remote doesn't have this document")),
                 Some(payload) => {
-                    let bytes = Bytes::from(payload.content.clone());
+                    let bytes = Bytes::from(payload.data.clone());
                     let doc_md5 = md5(&bytes);
                     let revision = Revision::new(&payload.doc_id, payload.base_rev_id, payload.rev_id, bytes, doc_md5);
                     Ok(vec![revision])

frontend/rust-lib/flowy-document/src/manager.rs

@@ -5,16 +5,14 @@ use crate::{errors::FlowyError, DocumentEditor, DocumentUser};
 use bytes::Bytes;
 use flowy_database::ConnectionPool;
 use flowy_error::{internal_error, FlowyResult};
+use flowy_http_model::document::DocumentPayloadPB;
+use flowy_http_model::revision::Revision;
+use flowy_http_model::ws_data::ServerRevisionWSData;
 use flowy_revision::{
     RevisionCloudService, RevisionManager, RevisionMergeable, RevisionObjectDeserializer, RevisionObjectSerializer,
     RevisionWebSocket,
 };
-use flowy_sync::entities::ws_data::ServerRevisionWSData;
-use flowy_sync::{
-    entities::{document::DocumentPayloadPB, revision::Revision},
-    errors::CollaborateResult,
-    util::make_operations_from_revisions,
-};
+use flowy_sync::{errors::CollaborateResult, util::make_operations_from_revisions};
 use lib_infra::future::FutureResult;
 use lib_ot::core::{AttributeEntry, AttributeHashMap};
 use lib_ot::{
@@ -47,7 +45,7 @@ impl DeltaDocumentEditor {
         let document = rev_manager
             .initialize::<DeltaDocumentRevisionSerde>(Some(cloud_service))
             .await?;
-        let operations = DeltaTextOperations::from_bytes(&document.content)?;
+        let operations = DeltaTextOperations::from_bytes(&document.data)?;
         let rev_manager = Arc::new(rev_manager);
         let doc_id = doc_id.to_string();
         let user_id = user.user_id()?;
@@ -255,7 +253,7 @@ impl RevisionObjectDeserializer for DeltaDocumentRevisionSerde {
 
         Result::<DocumentPayloadPB, FlowyError>::Ok(DocumentPayloadPB {
             doc_id: object_id.to_owned(),
-            content: delta.json_str(),
+            data: delta.json_bytes().to_vec(),
             rev_id,
             base_rev_id,
         })