chore: update collab rev and fix compile (#3398)

frontend/appflowy_tauri/src-tauri/Cargo.lock

@@ -140,11 +140,12 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 [[package]]
 name = "appflowy-integrate"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
  "collab-database",
+ "collab-define",
  "collab-document",
  "collab-folder",
  "collab-persistence",
@@ -729,7 +730,7 @@ dependencies = [
 [[package]]
 name = "collab"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -748,13 +749,14 @@ dependencies = [
 [[package]]
 name = "collab-database"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.21.2",
  "chrono",
  "collab",
+ "collab-define",
  "collab-derive",
  "collab-persistence",
  "collab-plugins",
@@ -777,7 +779,7 @@ dependencies = [
 [[package]]
 name = "collab-define"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
@@ -789,7 +791,7 @@ dependencies = [
 [[package]]
 name = "collab-derive"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -801,7 +803,7 @@ dependencies = [
 [[package]]
 name = "collab-document"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
@@ -821,7 +823,7 @@ dependencies = [
 [[package]]
 name = "collab-folder"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "chrono",
@@ -841,7 +843,7 @@ dependencies = [
 [[package]]
 name = "collab-persistence"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "async-trait",
  "bincode",
@@ -862,7 +864,7 @@ dependencies = [
 [[package]]
 name = "collab-plugins"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -891,7 +893,7 @@ dependencies = [
 [[package]]
 name = "collab-sync-protocol"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "bytes",
  "collab",
@@ -905,7 +907,7 @@ dependencies = [
 [[package]]
 name = "collab-user"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
@@ -921,7 +923,7 @@ dependencies = [
 [[package]]
 name = "collab-ws"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "bytes",
  "collab-sync-protocol",
@@ -1556,6 +1558,7 @@ version = "0.1.0"
 dependencies = [
  "appflowy-integrate",
  "bytes",
+ "collab-define",
  "diesel",
  "flowy-config",
  "flowy-database-deps",
@@ -1591,7 +1594,7 @@ name = "flowy-database-deps"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collab-plugins",
+ "collab-define",
  "flowy-error",
  "lib-infra",
 ]
@@ -1609,6 +1612,7 @@ dependencies = [
  "chrono-tz 0.8.2",
  "collab",
  "collab-database",
+ "collab-define",
  "csv",
  "dashmap",
  "fancy-regex 0.10.0",
@@ -1672,6 +1676,7 @@ dependencies = [
  "appflowy-integrate",
  "bytes",
  "collab",
+ "collab-define",
  "collab-document",
  "flowy-codegen",
  "flowy-derive",
@@ -1750,6 +1755,7 @@ dependencies = [
  "bytes",
  "chrono",
  "collab",
+ "collab-define",
  "collab-folder",
  "flowy-codegen",
  "flowy-derive",
@@ -1803,6 +1809,7 @@ dependencies = [
  "bytes",
  "chrono",
  "collab",
+ "collab-define",
  "collab-document",
  "collab-plugins",
  "config",
@@ -1900,6 +1907,7 @@ dependencies = [
  "chrono",
  "collab",
  "collab-database",
+ "collab-define",
  "collab-document",
  "collab-folder",
  "collab-user",

frontend/appflowy_tauri/src-tauri/Cargo.toml

@@ -34,15 +34,15 @@ default = ["custom-protocol"]
 custom-protocol = ["tauri/custom-protocol"]
 
 [patch.crates-io]
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
 
 #collab = { path = "../../../../AppFlowy-Collab/collab" }
 #collab-folder = { path = "../../../../AppFlowy-Collab/collab-folder" }

frontend/rust-lib/Cargo.lock

@@ -120,11 +120,12 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 [[package]]
 name = "appflowy-integrate"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
  "collab-database",
+ "collab-define",
  "collab-document",
  "collab-folder",
  "collab-persistence",
@@ -612,7 +613,7 @@ dependencies = [
 [[package]]
 name = "collab"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -631,13 +632,14 @@ dependencies = [
 [[package]]
 name = "collab-database"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.21.2",
  "chrono",
  "collab",
+ "collab-define",
  "collab-derive",
  "collab-persistence",
  "collab-plugins",
@@ -660,7 +662,7 @@ dependencies = [
 [[package]]
 name = "collab-define"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
@@ -672,7 +674,7 @@ dependencies = [
 [[package]]
 name = "collab-derive"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -684,7 +686,7 @@ dependencies = [
 [[package]]
 name = "collab-document"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
@@ -704,7 +706,7 @@ dependencies = [
 [[package]]
 name = "collab-folder"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "chrono",
@@ -724,7 +726,7 @@ dependencies = [
 [[package]]
 name = "collab-persistence"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "async-trait",
  "bincode",
@@ -745,7 +747,7 @@ dependencies = [
 [[package]]
 name = "collab-plugins"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -774,7 +776,7 @@ dependencies = [
 [[package]]
 name = "collab-sync-protocol"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "bytes",
  "collab",
@@ -788,7 +790,7 @@ dependencies = [
 [[package]]
 name = "collab-user"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "anyhow",
  "collab",
@@ -804,7 +806,7 @@ dependencies = [
 [[package]]
 name = "collab-ws"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=eaa9844#eaa9844c17bd64b2ef00c26245b5cb44756dda4c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=9bb9a7#9bb9a7e33c17677ec6f553fb8b98f66d6c9b6c2e"
 dependencies = [
  "bytes",
  "collab-sync-protocol",
@@ -1342,6 +1344,7 @@ version = "0.1.0"
 dependencies = [
  "appflowy-integrate",
  "bytes",
+ "collab-define",
  "console-subscriber",
  "diesel",
  "flowy-config",
@@ -1378,7 +1381,7 @@ name = "flowy-database-deps"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collab-plugins",
+ "collab-define",
  "flowy-error",
  "lib-infra",
 ]
@@ -1396,6 +1399,7 @@ dependencies = [
  "chrono-tz 0.8.2",
  "collab",
  "collab-database",
+ "collab-define",
  "csv",
  "dashmap",
  "fancy-regex 0.10.0",
@@ -1460,6 +1464,7 @@ dependencies = [
  "appflowy-integrate",
  "bytes",
  "collab",
+ "collab-define",
  "collab-document",
  "flowy-codegen",
  "flowy-derive",
@@ -1541,6 +1546,7 @@ dependencies = [
  "bytes",
  "chrono",
  "collab",
+ "collab-define",
  "collab-folder",
  "flowy-codegen",
  "flowy-derive",
@@ -1597,6 +1603,7 @@ dependencies = [
  "bytes",
  "chrono",
  "collab",
+ "collab-define",
  "collab-document",
  "collab-plugins",
  "config",
@@ -1747,6 +1754,7 @@ dependencies = [
  "chrono",
  "collab",
  "collab-database",
+ "collab-define",
  "collab-document",
  "collab-folder",
  "collab-user",

frontend/rust-lib/Cargo.toml

@@ -49,14 +49,14 @@ lto = false
 incremental = false
 
 [patch.crates-io]
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
-collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "eaa9844" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
+collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "9bb9a7" }
 
 #collab = { path = "../AppFlowy-Collab/collab" }
 #collab-folder = { path = "../AppFlowy-Collab/collab-folder" }

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

@@ -24,6 +24,7 @@ flowy-server = { path = "../flowy-server" }
 flowy-server-config = { path = "../flowy-server-config" }
 flowy-config = { path = "../flowy-config" }
 appflowy-integrate = { version = "0.1.0", features = ["postgres_storage_plugin", "snapshot_plugin"] }
+collab-define = { version = "0.1.0" }
 diesel = { version = "1.4.8", features = ["sqlite"] }
 uuid = { version = "1.3.3", features = ["v4"] }
 flowy-storage = { path = "../flowy-storage" }

frontend/rust-lib/flowy-core/src/integrate/server.rs

@@ -3,8 +3,9 @@ use std::fmt::{Display, Formatter};
 use std::sync::{Arc, Weak};
 
 use appflowy_integrate::collab_builder::{CollabStorageProvider, CollabStorageType};
-use appflowy_integrate::{CollabObject, CollabType, RemoteCollabStorage, YrsDocAction};
+use appflowy_integrate::{RemoteCollabStorage, YrsDocAction};
 use bytes::Bytes;
+use collab_define::{CollabObject, CollabType};
 use parking_lot::RwLock;
 use serde_repr::*;
 

frontend/rust-lib/flowy-database-deps/Cargo.toml

@@ -8,5 +8,5 @@ edition = "2021"
 [dependencies]
 lib-infra = { path = "../../../shared-lib/lib-infra" }
 flowy-error = { path = "../flowy-error" }
-collab-plugins = { version = "0.1.0" }
+collab-define = { version = "0.1.0" }
 anyhow = "1.0.71"

frontend/rust-lib/flowy-database-deps/src/cloud.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use anyhow::Error;
-use collab_plugins::cloud_storage::CollabType;
+use collab_define::CollabType;
 
 use lib_infra::future::FutureResult;
 

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

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 collab = { version = "0.1.0" }
 collab-database = { version = "0.1.0" }
+collab-define = { version = "0.1.0" }
 appflowy-integrate = {version = "0.1.0" }
 flowy-database-deps = { path = "../flowy-database-deps" }
 

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

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::sync::{Arc, Weak};
 
 use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;
-use appflowy_integrate::{CollabPersistenceConfig, CollabType, RocksCollabDB};
+use appflowy_integrate::{CollabPersistenceConfig, RocksCollabDB};
 use collab::core::collab::{CollabRawData, MutexCollab};
 use collab_database::blocks::BlockEvent;
 use collab_database::database::{DatabaseData, YrsDocAction};
@@ -12,6 +12,7 @@ use collab_database::user::{
   WorkspaceDatabase,
 };
 use collab_database::views::{CreateDatabaseParams, CreateViewParams, DatabaseLayout};
+use collab_define::CollabType;
 use tokio::sync::RwLock;
 
 use flowy_database_deps::cloud::DatabaseCloudService;

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

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 collab = { version = "0.1.0" }
 collab-document = { version = "0.1.0" }
+collab-define = { version = "0.1.0" }
 appflowy-integrate = {version = "0.1.0" }
 flowy-document-deps = { path = "../flowy-document-deps" }
 flowy-storage = { path = "../flowy-storage" }

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

@@ -2,8 +2,9 @@ use std::sync::Weak;
 use std::{collections::HashMap, sync::Arc};
 
 use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;
-use appflowy_integrate::{CollabType, RocksCollabDB};
+use appflowy_integrate::RocksCollabDB;
 use collab::core::collab::MutexCollab;
+use collab_define::CollabType;
 use collab_document::blocks::DocumentData;
 use collab_document::document::Document;
 use collab_document::document_data::default_document_data;

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

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 collab = { version = "0.1.0" }
 collab-folder = { version = "0.1.0" }
+collab-define = { version = "0.1.0" }
 appflowy-integrate = {version = "0.1.0" }
 flowy-folder-deps = { path = "../flowy-folder-deps" }
 

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

@@ -3,9 +3,10 @@ use std::ops::Deref;
 use std::sync::{Arc, Weak};
 
 use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;
-use appflowy_integrate::{CollabPersistenceConfig, CollabType, RocksCollabDB, YrsDocAction};
+use appflowy_integrate::{CollabPersistenceConfig, RocksCollabDB, YrsDocAction};
 use collab::core::collab::{CollabRawData, MutexCollab};
 use collab::core::collab_state::SyncState;
+use collab_define::CollabType;
 use collab_folder::core::{
   FavoritesInfo, Folder, FolderData, FolderNotify, TrashChange, TrashChangeReceiver, TrashInfo,
   View, ViewChange, ViewChangeReceiver, ViewLayout, ViewUpdate, Workspace,

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

@@ -27,6 +27,7 @@ chrono = { version = "0.4.22", default-features = false, features = ["clock"] }
 collab = { version = "0.1.0" }
 collab-plugins = { version = "0.1.0" }
 collab-document = { version = "0.1.0" }
+collab-define = { version = "0.1.0" }
 hex = "0.4.3"
 postgrest = "1.0"
 lib-infra = { path = "../../../shared-lib/lib-infra" }

frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs

@@ -1,5 +1,5 @@
 use anyhow::Error;
-use collab_plugins::cloud_storage::CollabType;
+use collab_define::CollabType;
 
 use flowy_database_deps::cloud::{
   CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,

frontend/rust-lib/flowy-server/src/af_cloud/impls/user.rs

@@ -1,5 +1,5 @@
 use anyhow::Error;
-use collab_plugins::cloud_storage::CollabObject;
+use collab_define::CollabObject;
 
 use flowy_error::{ErrorCode, FlowyError};
 use flowy_user_deps::cloud::UserCloudService;

frontend/rust-lib/flowy-server/src/af_cloud/server.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
-use collab_plugins::cloud_storage::{CollabObject, RemoteCollabStorage};
+use collab_define::CollabObject;
+use collab_plugins::cloud_storage::RemoteCollabStorage;
 
 use flowy_database_deps::cloud::DatabaseCloudService;
 use flowy_document_deps::cloud::DocumentCloudService;

frontend/rust-lib/flowy-server/src/local_server/impls/database.rs

@@ -1,5 +1,5 @@
 use anyhow::Error;
-use collab_plugins::cloud_storage::CollabType;
+use collab_define::CollabType;
 
 use flowy_database_deps::cloud::{
   CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,

frontend/rust-lib/flowy-server/src/local_server/impls/user.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::Error;
-use collab_plugins::cloud_storage::CollabObject;
+use collab_define::CollabObject;
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
 

frontend/rust-lib/flowy-server/src/local_server/server.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
-use collab_plugins::cloud_storage::{CollabObject, RemoteCollabStorage};
+use collab_define::CollabObject;
+use collab_plugins::cloud_storage::RemoteCollabStorage;
 use parking_lot::RwLock;
 use tokio::sync::mpsc;
 

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

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
-use collab_plugins::cloud_storage::{CollabObject, RemoteCollabStorage};
+use collab_define::CollabObject;
+use collab_plugins::cloud_storage::RemoteCollabStorage;
 use parking_lot::RwLock;
 
 use flowy_database_deps::cloud::DatabaseCloudService;

frontend/rust-lib/flowy-server/src/supabase/api/collab_storage.rs

@@ -4,9 +4,9 @@ use std::sync::{Arc, Weak};
 use anyhow::Error;
 use chrono::{DateTime, Utc};
 use collab::preclude::merge_updates_v1;
+use collab_define::CollabObject;
 use collab_plugins::cloud_storage::{
-  CollabObject, MsgId, RemoteCollabSnapshot, RemoteCollabState, RemoteCollabStorage,
-  RemoteUpdateReceiver,
+  MsgId, RemoteCollabSnapshot, RemoteCollabState, RemoteCollabStorage, RemoteUpdateReceiver,
 };
 use parking_lot::Mutex;
 use tokio::task::spawn_blocking;

frontend/rust-lib/flowy-server/src/supabase/api/database.rs

@@ -1,5 +1,5 @@
 use anyhow::Error;
-use collab_plugins::cloud_storage::CollabType;
+use collab_define::CollabType;
 use tokio::sync::oneshot::channel;
 
 use flowy_database_deps::cloud::{

frontend/rust-lib/flowy-server/src/supabase/api/document.rs

@@ -1,8 +1,8 @@
 use anyhow::Error;
 use collab::core::origin::CollabOrigin;
+use collab_define::CollabType;
 use collab_document::blocks::DocumentData;
 use collab_document::document::Document;
-use collab_plugins::cloud_storage::CollabType;
 use tokio::sync::oneshot::channel;
 
 use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};

frontend/rust-lib/flowy-server/src/supabase/api/folder.rs

@@ -3,7 +3,7 @@ use std::str::FromStr;
 use anyhow::Error;
 use chrono::{DateTime, Utc};
 use collab::core::origin::CollabOrigin;
-use collab_plugins::cloud_storage::CollabType;
+use collab_define::CollabType;
 use serde_json::Value;
 use tokio::sync::oneshot::channel;
 

frontend/rust-lib/flowy-server/src/supabase/api/request.rs

@@ -7,7 +7,8 @@ use std::time::Duration;
 
 use anyhow::Error;
 use chrono::{DateTime, Utc};
-use collab_plugins::cloud_storage::{CollabObject, CollabType, RemoteCollabSnapshot};
+use collab_define::{CollabObject, CollabType};
+use collab_plugins::cloud_storage::RemoteCollabSnapshot;
 use serde_json::Value;
 use tokio_retry::strategy::FixedInterval;
 use tokio_retry::{Action, Condition, RetryIf};

frontend/rust-lib/flowy-server/src/supabase/api/user.rs

@@ -8,7 +8,7 @@ use std::time::Duration;
 use anyhow::Error;
 use collab::core::collab::MutexCollab;
 use collab::core::origin::CollabOrigin;
-use collab_plugins::cloud_storage::CollabObject;
+use collab_define::{CollabObject, CollabType};
 use parking_lot::RwLock;
 use serde_json::Value;
 use tokio::sync::oneshot::channel;

frontend/rust-lib/flowy-server/src/supabase/define.rs

@@ -1,4 +1,4 @@
-pub use collab_plugins::cloud_storage::CollabType;
+use collab_define::CollabType;
 
 pub const AF_COLLAB_UPDATE_TABLE: &str = "af_collab_update";
 pub const AF_COLLAB_KEY_COLUMN: &str = "key";

frontend/rust-lib/flowy-server/src/supabase/server.rs

@@ -1,7 +1,8 @@
 use std::collections::HashMap;
 use std::sync::{Arc, Weak};
 
-use collab_plugins::cloud_storage::{CollabObject, RemoteCollabStorage, RemoteUpdateSender};
+use collab_define::CollabObject;
+use collab_plugins::cloud_storage::{RemoteCollabStorage, RemoteUpdateSender};
 use parking_lot::RwLock;
 
 use flowy_database_deps::cloud::DatabaseCloudService;

frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rs

@@ -1,4 +1,4 @@
-use collab_plugins::cloud_storage::{CollabObject, CollabType};
+use collab_define::{CollabObject, CollabType};
 use uuid::Uuid;
 
 use flowy_user_deps::entities::SignUpResponse;

frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs

@@ -1,5 +1,5 @@
 use assert_json_diff::assert_json_eq;
-use collab_plugins::cloud_storage::{CollabObject, CollabType};
+use collab_define::{CollabObject, CollabType};
 use serde_json::json;
 use uuid::Uuid;
 use yrs::types::ToJson;

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

@@ -21,6 +21,7 @@ collab-folder = { version = "0.1.0" }
 collab-document = { version = "0.1.0" }
 collab-database = { version = "0.1.0" }
 collab-user = { version = "0.1.0" }
+collab-define = { version = "0.1.0" }
 flowy-user-deps = { path = "../flowy-user-deps" }
 anyhow = "1.0.75"
 

frontend/rust-lib/flowy-user/src/entities/reminder.rs

@@ -1,4 +1,5 @@
-use appflowy_integrate::reminder::{ObjectType, Reminder};
+use collab_define::reminder::{ObjectType, Reminder};
+
 use flowy_derive::ProtoBuf;
 
 #[derive(ProtoBuf, Default, Clone)]

frontend/rust-lib/flowy-user/src/migrations/sync_new_user.rs

@@ -4,12 +4,13 @@ use std::pin::Pin;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Error};
-use appflowy_integrate::{CollabObject, CollabType, PersistenceError, RocksCollabDB, YrsDocAction};
+use appflowy_integrate::{PersistenceError, RocksCollabDB, YrsDocAction};
 use collab::core::collab::MutexCollab;
 use collab::preclude::Collab;
 use collab_database::database::get_database_row_ids;
 use collab_database::rows::database_row_document_id_from_row_id;
 use collab_database::user::{get_database_with_views, DatabaseWithViews};
+use collab_define::{CollabObject, CollabType};
 use collab_folder::core::{Folder, View, ViewLayout};
 use parking_lot::Mutex;
 

frontend/rust-lib/flowy-user/src/services/user_awareness.rs

@@ -1,8 +1,9 @@
 use std::sync::{Arc, Weak};
 
-use appflowy_integrate::reminder::Reminder;
-use appflowy_integrate::{CollabType, RocksCollabDB};
+use appflowy_integrate::RocksCollabDB;
 use collab::core::collab::{CollabRawData, MutexCollab};
+use collab_define::reminder::Reminder;
+use collab_define::CollabType;
 use collab_user::core::{MutexUserAwareness, UserAwareness};
 
 use flowy_error::{ErrorCode, FlowyError, FlowyResult};

frontend/rust-lib/flowy-user/src/services/user_workspace.rs

@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 use std::sync::Arc;
 
-use appflowy_integrate::{CollabObject, CollabType};
+use collab_define::{CollabObject, CollabType};
 
 use flowy_error::{FlowyError, FlowyResult};
 use flowy_sqlite::schema::user_workspace_table;