Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: bump up collab (#2740)
Nathan.fooo37547a6485c6
diff --git a/frontend/appflowy_flutter/lib/core/config/kv.dart b/frontend/appflowy_flutter/lib/core/config/kv.dartindex 4c0901cb8c..8ed337de51 100644--- a/frontend/appflowy_flutter/lib/core/config/kv.dart+++ b/frontend/appflowy_flutter/lib/core/config/kv.dart@@ -79,8 +79,7 @@ class RustKeyValue implements KeyValueStorage {}@override- Future<void> clear() {- // TODO: implement clear- throw UnimplementedError();+ Future<void> clear() async {+ // TODO(Lucas): implement clear}}diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex b30f0cfb8f..0335a619c1 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -693,10 +693,10 @@ packages:dependency: transitivedescription:name: intl_utils- sha256: db392393fbf891e3eb32f6beb1928b00cdb33e3c54597fd5f5dc5c43e5ba601c+ sha256: a509a2ada4d12c4dc70f9ca35c2fddf75f8b402409ac1a9e1b3dd8065681986burl: "https://pub.dev"source: hosted- version: "2.8.2"+ version: "2.8.3"io:dependency: transitivedescription:diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 7b78c4f5ee..361d36951e 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -99,7 +99,7 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"[[package]]name = "appflowy-integrate"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","collab",@@ -1024,7 +1024,7 @@ dependencies = [[[package]]name = "collab"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","bytes",@@ -1042,7 +1042,7 @@ dependencies = [[[package]]name = "collab-client-ws"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["bytes","collab-sync",@@ -1060,7 +1060,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","async-trait",@@ -1086,7 +1086,7 @@ dependencies = [[[package]]name = "collab-derive"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["proc-macro2","quote",@@ -1098,7 +1098,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","collab",@@ -1115,9 +1115,10 @@ dependencies = [[[package]]name = "collab-folder"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow",+ "chrono","collab","collab-derive","collab-persistence",@@ -1134,7 +1135,7 @@ dependencies = [[[package]]name = "collab-persistence"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["bincode","chrono",@@ -1154,7 +1155,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","async-trait",@@ -1185,7 +1186,7 @@ dependencies = [[[package]]name = "collab-sync"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a647d9#a647d922ef432510d6be0abb5f968d9a75dc7011"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["bytes","collab",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex b9b77af9be..b5c8af7fe9 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -34,12 +34,12 @@ default = ["custom-protocol"]custom-protocol = ["tauri/custom-protocol"][patch.crates-io]-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }#collab = { path = "../../AppFlowy-Collab/collab" }#collab-folder = { path = "../../AppFlowy-Collab/collab-folder" }diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex ea89cb571c..99edca5a0c 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -85,7 +85,7 @@ checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"[[package]]name = "appflowy-integrate"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","collab",@@ -887,7 +887,7 @@ dependencies = [[[package]]name = "collab"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","bytes",@@ -905,7 +905,7 @@ dependencies = [[[package]]name = "collab-client-ws"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["bytes","collab-sync",@@ -923,7 +923,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","async-trait",@@ -949,7 +949,7 @@ dependencies = [[[package]]name = "collab-derive"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["proc-macro2","quote",@@ -961,7 +961,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","collab",@@ -978,9 +978,10 @@ dependencies = [[[package]]name = "collab-folder"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow",+ "chrono","collab","collab-derive","collab-persistence",@@ -997,7 +998,7 @@ dependencies = [[[package]]name = "collab-persistence"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["bincode","chrono",@@ -1017,7 +1018,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["anyhow","async-trait",@@ -1048,7 +1049,7 @@ dependencies = [[[package]]name = "collab-sync"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=046a91#046a916cc357f4b6c88f4f5a66a84ca0e14c3c62"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=87f534#87f53452241a65275f5b2878ba57dff2a0e2b838"dependencies = ["bytes","collab",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex eb8bd4dd3a..865ac1ac0f 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -33,11 +33,11 @@ opt-level = 3incremental = false[patch.crates-io]-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }-appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "046a91" }+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }+appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "87f534" }#collab = { path = "../AppFlowy-Collab/collab" }#collab-folder = { path = "../AppFlowy-Collab/collab-folder" }diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rsindex d238b0d810..316c61a324 100644--- a/frontend/rust-lib/flowy-error/src/code.rs+++ b/frontend/rust-lib/flowy-error/src/code.rs@@ -199,6 +199,9 @@ pub enum ErrorCode {#[error("Missing auth field")]MissingAuthField = 65,++ #[error("Only one application can access the database")]+ MultipleDBInstance = 66,}impl ErrorCode {diff --git a/frontend/rust-lib/flowy-folder2/src/manager.rs b/frontend/rust-lib/flowy-folder2/src/manager.rsindex 2f3293983a..8e65968fc0 100644--- a/frontend/rust-lib/flowy-folder2/src/manager.rs+++ b/frontend/rust-lib/flowy-folder2/src/manager.rs@@ -6,8 +6,8 @@ use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;use appflowy_integrate::CollabPersistenceConfig;use collab::core::collab_state::CollabState;use collab_folder::core::{- Folder, FolderContext, TrashChange, TrashChangeReceiver, TrashInfo, TrashRecord, View,- ViewChange, ViewChangeReceiver, ViewLayout, Workspace,+ Folder, FolderContext, TrashChange, TrashChangeReceiver, TrashInfo, View, ViewChange,+ ViewChangeReceiver, ViewLayout, Workspace,};use parking_lot::Mutex;use tokio_stream::wrappers::WatchStream;@@ -15,7 +15,6 @@ use tokio_stream::StreamExt;use tracing::{event, Level};use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use lib_infra::util::timestamp;use crate::deps::{FolderCloudService, FolderUser};use crate::entities::{@@ -114,7 +113,7 @@ impl Folder2Manager {}/// Called immediately after the application launched fi the user already sign in/sign up.- #[tracing::instrument(level = "debug", skip(self), err)]+ #[tracing::instrument(level = "info", skip(self), err)]pub async fn initialize(&self, uid: i64, workspace_id: &str) -> FlowyResult<()> {let workspace_id = workspace_id.to_string();if let Ok(collab_db) = self.user.collab_db() {@@ -176,6 +175,7 @@ impl Folder2Manager {///pub async fn clear(&self, _user_id: i64) {}+ #[tracing::instrument(level = "info", skip_all, err)]pub async fn create_workspace(&self, params: CreateWorkspaceParams) -> FlowyResult<Workspace> {let workspace = self.cloud_service@@ -194,6 +194,7 @@ impl Folder2Manager {Ok(workspace)}+ #[tracing::instrument(level = "info", skip_all, err)]pub async fn open_workspace(&self, workspace_id: &str) -> FlowyResult<Workspace> {self.with_folder(Err(FlowyError::internal()), |folder| {let workspace = folder@@ -281,7 +282,6 @@ impl Folder2Manager {let folder = self.mutex_folder.lock();let folder = folder.as_ref().ok_or_else(folder_not_init_error)?;let trash_ids = folder- .trash.get_all_trash().into_iter().map(|trash| trash.id)@@ -312,10 +312,7 @@ impl Folder2Manager {#[tracing::instrument(level = "debug", skip(self), err)]pub async fn move_view_to_trash(&self, view_id: &str) -> FlowyResult<()> {self.with_folder((), |folder| {- folder.trash.add_trash(vec![TrashRecord {- id: view_id.to_string(),- created_at: timestamp(),- }]);+ folder.add_trash(vec![view_id.to_string()]);// notify the parent view that the view is moved to trashsend_notification(view_id, FolderNotification::DidMoveViewToTrash)@@ -463,13 +460,13 @@ impl Folder2Manager {#[tracing::instrument(level = "trace", skip(self))]pub(crate) async fn get_all_trash(&self) -> Vec<TrashInfo> {- self.with_folder(vec![], |folder| folder.trash.get_all_trash())+ self.with_folder(vec![], |folder| folder.get_all_trash())}#[tracing::instrument(level = "trace", skip(self))]pub(crate) async fn restore_all_trash(&self) {self.with_folder((), |folder| {- folder.trash.clear();+ folder.remote_all_trash();});send_notification("trash", FolderNotification::DidUpdateTrash)@@ -480,14 +477,14 @@ impl Folder2Manager {#[tracing::instrument(level = "trace", skip(self))]pub(crate) async fn restore_trash(&self, trash_id: &str) {self.with_folder((), |folder| {- folder.trash.delete_trash(vec![trash_id]);+ folder.delete_trash(vec![trash_id.to_string()]);});}/// Delete all the trash permanently.#[tracing::instrument(level = "trace", skip(self))]pub(crate) async fn delete_all_trash(&self) {- let deleted_trash = self.with_folder(vec![], |folder| folder.trash.get_all_trash());+ let deleted_trash = self.with_folder(vec![], |folder| folder.get_all_trash());for trash in deleted_trash {let _ = self.delete_trash(&trash.id).await;}@@ -503,7 +500,7 @@ impl Folder2Manager {pub async fn delete_trash(&self, view_id: &str) -> FlowyResult<()> {let view = self.with_folder(None, |folder| folder.views.get_view(view_id));self.with_folder((), |folder| {- folder.trash.delete_trash(vec![view_id]);+ folder.delete_trash(vec![view_id.to_string()]);folder.views.delete_views(vec![view_id]);});if let Some(view) = view {@@ -667,7 +664,7 @@ fn listen_on_trash_change(mut rx: TrashChangeReceiver, weak_mutex_folder: &Weak<unique_ids.insert(view.parent_view_id);}- let repeated_trash: RepeatedTrashPB = folder.trash.get_all_trash().into();+ let repeated_trash: RepeatedTrashPB = folder.get_all_trash().into();send_notification("trash", FolderNotification::DidUpdateTrash).payload(repeated_trash).send();@@ -683,7 +680,6 @@ fn listen_on_trash_change(mut rx: TrashChangeReceiver, weak_mutex_folder: &Weak</// Return the views that belong to the workspace. The views are filtered by the trash.fn get_workspace_view_pbs(workspace_id: &str, folder: &Folder) -> Vec<ViewPB> {let trash_ids = folder- .trash.get_all_trash().into_iter().map(|trash| trash.id)@@ -724,7 +720,6 @@ fn notify_parent_view_did_change<T: AsRef<str>>(let folder = folder.as_ref()?;let workspace_id = folder.get_current_workspace_id()?;let trash_ids = folder- .trash.get_all_trash().into_iter().map(|trash| trash.id)diff --git a/frontend/rust-lib/flowy-user/src/services/database.rs b/frontend/rust-lib/flowy-user/src/services/database.rsindex d8264c094a..fc4dcbcb08 100644--- a/frontend/rust-lib/flowy-user/src/services/database.rs+++ b/frontend/rust-lib/flowy-user/src/services/database.rs@@ -5,7 +5,7 @@ use appflowy_integrate::RocksCollabDB;use lazy_static::lazy_static;use parking_lot::RwLock;-use flowy_error::FlowyError;+use flowy_error::{ErrorCode, FlowyError};use flowy_sqlite::ConnectionPool;use flowy_sqlite::{schema::user_table, DBConnection, Database};@@ -41,8 +41,8 @@ impl UserDB {tracing::trace!("open user db {} at path: {}", user_id, dir);let db = flowy_sqlite::init(&dir).map_err(|e| {- tracing::error!("open user: {} db failed, {:?}", user_id, e);- FlowyError::internal().context(e)+ tracing::error!("open user db failed, {:?}", e);+ FlowyError::new(ErrorCode::MultipleDBInstance, e)})?;let pool = db.get_pool();write_guard.insert(user_id.to_owned(), db);@@ -68,7 +68,14 @@ impl UserDB {dir.push("collab_db");tracing::trace!("open collab db {} at path: {:?}", user_id, dir);- let db = RocksCollabDB::open(dir).map_err(|err| FlowyError::internal().context(err))?;+ let db = match RocksCollabDB::open(dir) {+ Ok(db) => Ok(db),+ Err(err) => {+ tracing::error!("open collab db failed, {:?}", err);+ Err(FlowyError::new(ErrorCode::MultipleDBInstance, err))+ },+ }?;+let db = Arc::new(db);write_guard.insert(user_id.to_owned(), db.clone());drop(write_guard);