chore: fix compile

frontend/appflowy_tauri/src-tauri/Cargo.toml

@@ -33,11 +33,11 @@ default = ["custom-protocol"]
 custom-protocol = ["tauri/custom-protocol"]
 
 [patch.crates-io]
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
 
 #collab = { path = "../../AppFlowy-Collab/collab" }
 #collab-folder = { path = "../../AppFlowy-Collab/collab-folder" }

frontend/rust-lib/Cargo.lock

@@ -544,7 +544,7 @@ dependencies = [
 [[package]]
 name = "collab"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=935868#93586873d1982d3b4ab96993a39810e4bb4d1993"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
 dependencies = [
  "anyhow",
  "bytes",
@@ -562,13 +562,14 @@ dependencies = [
 [[package]]
 name = "collab-database"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=935868#93586873d1982d3b4ab96993a39810e4bb4d1993"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
 dependencies = [
  "anyhow",
  "chrono",
  "collab",
  "collab-derive",
  "collab-persistence",
+ "collab-plugins",
  "lazy_static",
  "lru",
  "nanoid",
@@ -584,7 +585,7 @@ dependencies = [
 [[package]]
 name = "collab-derive"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=935868#93586873d1982d3b4ab96993a39810e4bb4d1993"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -596,7 +597,7 @@ dependencies = [
 [[package]]
 name = "collab-document"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=935868#93586873d1982d3b4ab96993a39810e4bb4d1993"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
 dependencies = [
  "anyhow",
  "collab",
@@ -613,7 +614,7 @@ dependencies = [
 [[package]]
 name = "collab-folder"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=935868#93586873d1982d3b4ab96993a39810e4bb4d1993"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
 dependencies = [
  "anyhow",
  "collab",
@@ -631,7 +632,7 @@ dependencies = [
 [[package]]
 name = "collab-persistence"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=935868#93586873d1982d3b4ab96993a39810e4bb4d1993"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
 dependencies = [
  "bincode",
  "chrono",
@@ -648,6 +649,59 @@ dependencies = [
  "yrs",
 ]
 
+[[package]]
+name = "collab-plugins"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
+dependencies = [
+ "collab",
+ "collab-persistence",
+ "collab-sync",
+ "collab-ws",
+ "tracing",
+ "y-sync",
+ "yrs",
+]
+
+[[package]]
+name = "collab-sync"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
+dependencies = [
+ "bytes",
+ "collab",
+ "futures-util",
+ "lib0",
+ "md5",
+ "parking_lot 0.12.1",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tracing",
+ "y-sync",
+ "yrs",
+]
+
+[[package]]
+name = "collab-ws"
+version = "0.1.0"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=46c9a1#46c9a199af9b2654080bebdcd9637b7a5d7bffe8"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-retry",
+ "tokio-stream",
+ "tokio-tungstenite 0.18.0",
+ "tracing",
+]
+
 [[package]]
 name = "color-eyre"
 version = "0.5.11"
@@ -1326,6 +1380,7 @@ dependencies = [
  "collab",
  "collab-database",
  "collab-persistence",
+ "collab-plugins",
  "dashmap",
  "database-model",
  "fancy-regex 0.10.0",
@@ -1428,6 +1483,7 @@ dependencies = [
  "collab",
  "collab-document",
  "collab-persistence",
+ "collab-plugins",
  "flowy-codegen",
  "flowy-derive",
  "flowy-error",
@@ -1480,6 +1536,7 @@ dependencies = [
  "collab",
  "collab-folder",
  "collab-persistence",
+ "collab-plugins",
  "flowy-codegen",
  "flowy-derive",
  "flowy-document",
@@ -2409,7 +2466,7 @@ dependencies = [
  "serde_repr",
  "strum_macros",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.15.0",
  "tracing",
  "url",
 ]
@@ -3838,6 +3895,17 @@ dependencies = [
  "opaque-debug",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.6",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.6"
@@ -4193,15 +4261,27 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
+ "tokio-util",
 ]
 
 [[package]]
@@ -4214,7 +4294,19 @@ dependencies = [
  "log",
  "pin-project",
  "tokio",
- "tungstenite",
+ "tungstenite 0.14.0",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.18.0",
 ]
 
 [[package]]
@@ -4477,6 +4569,25 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "tungstenite"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788"
+dependencies = [
+ "base64 0.13.1",
+ "byteorder",
+ "bytes",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
 [[package]]
 name = "typenum"
 version = "1.16.0"
@@ -4979,9 +5090,9 @@ dependencies = [
 
 [[package]]
 name = "y-sync"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a143afe4dde83bc987ad3119228d0f107053a3da131a00738cb2d7f496641"
+checksum = "f54d34b68ec4514a0659838c2b1ba867c571b20b3804a1338dacf4fa9062d801"
 dependencies = [
  "lib0",
  "thiserror",

frontend/rust-lib/Cargo.toml

@@ -40,11 +40,13 @@ opt-level = 3
 incremental = false
 
 [patch.crates-io]
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868"  }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868"  }
-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "935868" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1"  }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1"  }
+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
+collab-sync= { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "46c9a1" }
 
 #collab = { path = "../AppFlowy-Collab/collab" }
 #collab-folder = { path = "../AppFlowy-Collab/collab-folder" }

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

@@ -7,8 +7,9 @@ edition = "2021"
 
 [dependencies]
 collab = { version = "0.1.0" }
-collab-database = { version = "0.1.0" }
 collab-persistence = { version = "0.1.0" }
+collab-database = { version = "0.1.0" }
+collab-plugins = {version = "0.1.0", feature = ["disk_rocksdb", "sync"]}
 
 flowy-derive = { path = "../flowy-derive" }
 flowy-notification = { path = "../flowy-notification" }

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

@@ -1,4 +1,3 @@
-use collab::plugin_impl::rocks_disk::Config;
 use std::collections::HashMap;
 use std::ops::Deref;
 use std::sync::Arc;
@@ -7,6 +6,7 @@ use collab_database::database::DatabaseData;
 use collab_database::user::UserDatabase as InnerUserDatabase;
 use collab_database::views::{CreateDatabaseParams, CreateViewParams};
 use collab_persistence::kv::rocks_kv::RocksCollabDB;
+use collab_plugins::disk_plugin::rocksdb::Config;
 use parking_lot::Mutex;
 use tokio::sync::RwLock;
 

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

@@ -9,6 +9,7 @@ edition = "2021"
 collab = { version = "0.1.0" }
 collab-persistence = { version = "0.1.0" }
 collab-document = { version = "0.1.0" }
+collab-plugins = {version = "0.1.0", feature = ["disk_rocksdb", "sync"]}
 
 flowy-derive = { path = "../flowy-derive" }
 flowy-notification = { path = "../flowy-notification" }

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

@@ -1,6 +1,6 @@
-use collab::plugin_impl::rocks_disk::RocksDiskPlugin;
 use collab::preclude::{Collab, CollabBuilder};
 use collab_persistence::kv::rocks_kv::RocksCollabDB;
+use collab_plugins::disk_plugin::rocksdb::RocksdbDiskPlugin;
 use parking_lot::RwLock;
 use std::{collections::HashMap, sync::Arc};
 
@@ -77,7 +77,7 @@ impl DocumentManager {
     let kv_db = self.user.kv_db()?;
     let mut collab = CollabBuilder::new(uid, doc_id).build();
     let disk_plugin = Arc::new(
-      RocksDiskPlugin::new(uid, kv_db).map_err(|err| FlowyError::internal().context(err))?,
+      RocksdbDiskPlugin::new(uid, kv_db).map_err(|err| FlowyError::internal().context(err))?,
     );
     collab.add_plugin(disk_plugin);
     collab.initial();

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

@@ -9,6 +9,7 @@ edition = "2021"
 collab = { version = "0.1.0" }
 collab-folder = { version = "0.1.0" }
 collab-persistence = { version = "0.1.0" }
+collab-plugins = {version = "0.1.0", feature = ["disk_rocksdb", "sync"]}
 
 flowy-derive = { path = "../flowy-derive" }
 flowy-notification = { path = "../flowy-notification" }

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

@@ -2,13 +2,13 @@ use std::collections::{HashMap, HashSet};
 use std::ops::Deref;
 use std::sync::Arc;
 
-use collab::plugin_impl::rocks_disk::RocksDiskPlugin;
 use collab::preclude::CollabBuilder;
 use collab_folder::core::{
   Folder as InnerFolder, FolderContext, TrashChange, TrashChangeReceiver, TrashInfo, TrashRecord,
   View, ViewChange, ViewChangeReceiver, ViewLayout, Workspace,
 };
 use collab_persistence::kv::rocks_kv::RocksCollabDB;
+use collab_plugins::disk_plugin::rocksdb::RocksdbDiskPlugin;
 use parking_lot::Mutex;
 use tracing::{event, Level};
 
@@ -97,7 +97,7 @@ impl Folder2Manager {
       if let Ok(kv_db) = self.user.kv_db() {
         let mut collab = CollabBuilder::new(uid, folder_id).build();
         let disk_plugin = Arc::new(
-          RocksDiskPlugin::new(uid, kv_db).map_err(|err| FlowyError::internal().context(err))?,
+          RocksdbDiskPlugin::new(uid, kv_db).map_err(|err| FlowyError::internal().context(err))?,
         );
         collab.add_plugin(disk_plugin);
         collab.initial();