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
refactor: deps crates (#4362)
Nathan.fooo307556b7dd58
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex ae9d6ff682..b07def62b3 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -1149,7 +1149,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.6",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1650,21 +1650,20 @@ dependencies = ["collab-plugins","diesel","flowy-config",- "flowy-database-deps",+ "flowy-database-pub","flowy-database2","flowy-date","flowy-document",- "flowy-document-deps",+ "flowy-document-pub","flowy-error","flowy-folder",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-server",- "flowy-server-config",+ "flowy-server-pub","flowy-sqlite","flowy-storage",- "flowy-task","flowy-user",- "flowy-user-deps",+ "flowy-user-pub","futures","futures-core","lib-dispatch",@@ -1682,7 +1681,7 @@ dependencies = [][[package]]-name = "flowy-database-deps"+name = "flowy-database-pub"version = "0.1.0"dependencies = ["anyhow",@@ -1709,11 +1708,10 @@ dependencies = ["dashmap","fancy-regex 0.11.0","flowy-codegen",- "flowy-database-deps",+ "flowy-database-pub","flowy-derive","flowy-error","flowy-notification",- "flowy-task","futures","indexmap 2.1.0","lazy_static",@@ -1780,7 +1778,7 @@ dependencies = ["collab-integrate","flowy-codegen","flowy-derive",- "flowy-document-deps",+ "flowy-document-pub","flowy-error","flowy-notification","flowy-storage",@@ -1805,7 +1803,7 @@ dependencies = [][[package]]-name = "flowy-document-deps"+name = "flowy-document-pub"version = "0.1.0"dependencies = ["anyhow",@@ -1869,7 +1867,7 @@ dependencies = ["flowy-codegen","flowy-derive","flowy-error",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-notification","lazy_static","lib-dispatch",@@ -1888,7 +1886,7 @@ dependencies = [][[package]]-name = "flowy-folder-deps"+name = "flowy-folder-pub"version = "0.1.0"dependencies = ["anyhow",@@ -1925,14 +1923,14 @@ dependencies = ["collab-document","collab-entity","collab-plugins",- "flowy-database-deps",- "flowy-document-deps",+ "flowy-database-pub",+ "flowy-document-pub","flowy-encrypt","flowy-error",- "flowy-folder-deps",- "flowy-server-config",+ "flowy-folder-pub",+ "flowy-server-pub","flowy-storage",- "flowy-user-deps",+ "flowy-user-pub","futures","futures-util","hex",@@ -1958,7 +1956,7 @@ dependencies = [][[package]]-name = "flowy-server-config"+name = "flowy-server-pub"version = "0.1.0"dependencies = ["flowy-error",@@ -1999,17 +1997,6 @@ dependencies = ["url",]-[[package]]-name = "flowy-task"-version = "0.1.0"-dependencies = [- "anyhow",- "atomic_refcell",- "lib-infra",- "tokio",- "tracing",-]-[[package]]name = "flowy-user"version = "0.1.0"@@ -2032,11 +2019,11 @@ dependencies = ["flowy-derive","flowy-encrypt","flowy-error",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-notification",- "flowy-server-config",+ "flowy-server-pub","flowy-sqlite",- "flowy-user-deps",+ "flowy-user-pub","lazy_static","lib-dispatch","lib-infra",@@ -2057,7 +2044,7 @@ dependencies = [][[package]]-name = "flowy-user-deps"+name = "flowy-user-pub"version = "0.1.0"dependencies = ["anyhow",@@ -2122,9 +2109,9 @@ dependencies = [[[package]]name = "futures"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"dependencies = ["futures-channel","futures-core",@@ -2137,9 +2124,9 @@ dependencies = [[[package]]name = "futures-channel"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"dependencies = ["futures-core","futures-sink",@@ -2147,15 +2134,15 @@ dependencies = [[[package]]name = "futures-core"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"[[package]]name = "futures-executor"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"dependencies = ["futures-core","futures-task",@@ -2164,15 +2151,15 @@ dependencies = [[[package]]name = "futures-io"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"[[package]]name = "futures-macro"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"dependencies = ["proc-macro2","quote",@@ -2181,21 +2168,21 @@ dependencies = [[[package]]name = "futures-sink"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"[[package]]name = "futures-task"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"[[package]]name = "futures-util"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"dependencies = ["futures-channel","futures-core",@@ -3142,6 +3129,7 @@ version = "0.1.0"dependencies = ["anyhow","async-trait",+ "atomic_refcell","bytes","chrono","futures-core",@@ -3149,6 +3137,7 @@ dependencies = ["pin-project","tempfile","tokio",+ "tracing","validator","walkdir","zip",@@ -3937,6 +3926,7 @@ version = "0.11.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"dependencies = [+ "phf_macros 0.11.2","phf_shared 0.11.2",]@@ -4028,6 +4018,19 @@ dependencies = ["syn 1.0.109",]+[[package]]+name = "phf_macros"+version = "0.11.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"+dependencies = [+ "phf_generator 0.11.2",+ "phf_shared 0.11.2",+ "proc-macro2",+ "quote",+ "syn 2.0.47",+]+[[package]]name = "phf_shared"version = "0.8.0"diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 7d90b2a331..d6d39c33a0 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -1158,7 +1158,7 @@ dependencies = ["flowy-derive","flowy-notification","flowy-server",- "flowy-server-config",+ "flowy-server-pub","lazy_static","lib-dispatch","parking_lot",@@ -1447,19 +1447,19 @@ dependencies = ["collab-plugins","dotenv","flowy-core",- "flowy-database-deps",+ "flowy-database-pub","flowy-database2","flowy-document",- "flowy-document-deps",+ "flowy-document-pub","flowy-encrypt","flowy-folder",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-notification","flowy-server",- "flowy-server-config",+ "flowy-server-pub","flowy-storage","flowy-user",- "flowy-user-deps",+ "flowy-user-pub","futures-util","lib-dispatch","lib-infra",@@ -1640,21 +1640,20 @@ dependencies = ["console-subscriber","diesel","flowy-config",- "flowy-database-deps",+ "flowy-database-pub","flowy-database2","flowy-date","flowy-document",- "flowy-document-deps",+ "flowy-document-pub","flowy-error","flowy-folder",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-server",- "flowy-server-config",+ "flowy-server-pub","flowy-sqlite","flowy-storage",- "flowy-task","flowy-user",- "flowy-user-deps",+ "flowy-user-pub","futures","futures-core","lib-dispatch",@@ -1672,7 +1671,7 @@ dependencies = [][[package]]-name = "flowy-database-deps"+name = "flowy-database-pub"version = "0.1.0"dependencies = ["anyhow",@@ -1700,11 +1699,10 @@ dependencies = ["event-integration","fancy-regex 0.11.0","flowy-codegen",- "flowy-database-deps",+ "flowy-database-pub","flowy-derive","flowy-error","flowy-notification",- "flowy-task","futures","indexmap 2.1.0","lazy_static",@@ -1773,7 +1771,7 @@ dependencies = ["collab-integrate","flowy-codegen","flowy-derive",- "flowy-document-deps",+ "flowy-document-pub","flowy-error","flowy-notification","flowy-storage",@@ -1800,7 +1798,7 @@ dependencies = [][[package]]-name = "flowy-document-deps"+name = "flowy-document-pub"version = "0.1.0"dependencies = ["anyhow",@@ -1864,7 +1862,7 @@ dependencies = ["flowy-codegen","flowy-derive","flowy-error",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-notification","lazy_static","lib-dispatch",@@ -1883,7 +1881,7 @@ dependencies = [][[package]]-name = "flowy-folder-deps"+name = "flowy-folder-pub"version = "0.1.0"dependencies = ["anyhow",@@ -1923,14 +1921,14 @@ dependencies = ["collab-entity","collab-plugins","dotenv",- "flowy-database-deps",- "flowy-document-deps",+ "flowy-database-pub",+ "flowy-document-pub","flowy-encrypt","flowy-error",- "flowy-folder-deps",- "flowy-server-config",+ "flowy-folder-pub",+ "flowy-server-pub","flowy-storage",- "flowy-user-deps",+ "flowy-user-pub","futures","futures-util","hex",@@ -1957,7 +1955,7 @@ dependencies = [][[package]]-name = "flowy-server-config"+name = "flowy-server-pub"version = "0.1.0"dependencies = ["flowy-error",@@ -2001,19 +1999,6 @@ dependencies = ["url",]-[[package]]-name = "flowy-task"-version = "0.1.0"-dependencies = [- "anyhow",- "atomic_refcell",- "futures",- "lib-infra",- "rand 0.8.5",- "tokio",- "tracing",-]-[[package]]name = "flowy-user"version = "0.1.0"@@ -2037,11 +2022,11 @@ dependencies = ["flowy-derive","flowy-encrypt","flowy-error",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-notification",- "flowy-server-config",+ "flowy-server-pub","flowy-sqlite",- "flowy-user-deps",+ "flowy-user-pub","lazy_static","lib-dispatch","lib-infra",@@ -2067,7 +2052,7 @@ dependencies = [][[package]]-name = "flowy-user-deps"+name = "flowy-user-pub"version = "0.1.0"dependencies = ["anyhow",@@ -2138,9 +2123,9 @@ dependencies = [[[package]]name = "futures"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"dependencies = ["futures-channel","futures-core",@@ -2153,9 +2138,9 @@ dependencies = [[[package]]name = "futures-channel"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"dependencies = ["futures-core","futures-sink",@@ -2163,15 +2148,15 @@ dependencies = [[[package]]name = "futures-core"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"[[package]]name = "futures-executor"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"dependencies = ["futures-core","futures-task",@@ -2180,15 +2165,15 @@ dependencies = [[[package]]name = "futures-io"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"[[package]]name = "futures-macro"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"dependencies = ["proc-macro2","quote",@@ -2197,15 +2182,15 @@ dependencies = [[[package]]name = "futures-sink"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"[[package]]name = "futures-task"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"[[package]]name = "futures-timer"@@ -2215,9 +2200,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"[[package]]name = "futures-util"-version = "0.3.29"+version = "0.3.30"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"dependencies = ["futures-channel","futures-core",@@ -2832,14 +2817,18 @@ version = "0.1.0"dependencies = ["anyhow","async-trait",+ "atomic_refcell","brotli","bytes","chrono",+ "futures","futures-core","md5","pin-project",+ "rand 0.8.5","tempfile","tokio",+ "tracing","validator","walkdir","zip",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex ff9a8cf698..eadddeaf0d 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -5,20 +5,19 @@ members = ["flowy-core","dart-ffi","flowy-user",- "flowy-user-deps",+ "flowy-user-pub","event-integration","flowy-sqlite","flowy-folder",- "flowy-folder-deps",+ "flowy-folder-pub","flowy-notification","flowy-document",- "flowy-document-deps",+ "flowy-document-pub","flowy-error","flowy-database2",- "flowy-database-deps",- "flowy-task",+ "flowy-database-pub","flowy-server",- "flowy-server-config",+ "flowy-server-pub","flowy-config","flowy-encrypt","flowy-storage",@@ -42,19 +41,18 @@ flowy-derive = { workspace = true, path = "build-tool/flowy-derive" }flowy-core = { workspace = true, path = "flowy-core" }dart-ffi = { workspace = true, path = "dart-ffi" }flowy-user = { workspace = true, path = "flowy-user" }-flowy-user-deps = { workspace = true, path = "flowy-user-deps" }+flowy-user-pub = { workspace = true, path = "flowy-user-pub" }flowy-sqlite = { workspace = true, path = "flowy-sqlite" }flowy-folder = { workspace = true, path = "flowy-folder" }-flowy-folder-deps = { workspace = true, path = "flowy-folder-deps" }+flowy-folder-pub = { workspace = true, path = "flowy-folder-pub" }flowy-notification = { workspace = true, path = "flowy-notification" }flowy-document = { workspace = true, path = "flowy-document" }-flowy-document-deps = { workspace = true, path = "flowy-document-deps" }+flowy-document-pub = { workspace = true, path = "flowy-document-pub" }flowy-error = { workspace = true, path = "flowy-error" }flowy-database2 = { workspace = true, path = "flowy-database2" }-flowy-database-deps = { workspace = true, path = "flowy-database-deps" }-flowy-task = { workspace = true, path = "flowy-task" }+flowy-database-pub = { workspace = true, path = "flowy-database-pub" }flowy-server = { workspace = true, path = "flowy-server" }-flowy-server-config = { workspace = true, path = "flowy-server-config" }+flowy-server-pub = { workspace = true, path = "flowy-server-pub" }flowy-config = { workspace = true, path = "flowy-config" }flowy-encrypt = { workspace = true, path = "flowy-encrypt" }flowy-storage = { workspace = true, path = "flowy-storage" }diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.tomlindex 15fc8c1ba5..a80c536f63 100644--- a/frontend/rust-lib/dart-ffi/Cargo.toml+++ b/frontend/rust-lib/dart-ffi/Cargo.toml@@ -31,7 +31,7 @@ lib-dispatch = { workspace = true }flowy-core = { workspace = true }flowy-notification = { workspace = true }flowy-server = { workspace = true }-flowy-server-config = { workspace = true}+flowy-server-pub = { workspace = true}collab-integrate = { workspace = true }flowy-derive.workspace = trueserde_yaml = "0.9.27"diff --git a/frontend/rust-lib/dart-ffi/src/appflowy_yaml.rs b/frontend/rust-lib/dart-ffi/src/appflowy_yaml.rsindex 428d6a2703..f7aa46bdb8 100644--- a/frontend/rust-lib/dart-ffi/src/appflowy_yaml.rs+++ b/frontend/rust-lib/dart-ffi/src/appflowy_yaml.rs@@ -4,7 +4,7 @@ use std::path::Path;use serde::{Deserialize, Serialize};-use flowy_server_config::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;#[derive(Debug, Serialize, Deserialize, Clone, Default)]pub struct AppFlowyYamlConfiguration {diff --git a/frontend/rust-lib/dart-ffi/src/env_serde.rs b/frontend/rust-lib/dart-ffi/src/env_serde.rsindex e24aa3db0d..5c0e473b0f 100644--- a/frontend/rust-lib/dart-ffi/src/env_serde.rs+++ b/frontend/rust-lib/dart-ffi/src/env_serde.rs@@ -2,9 +2,9 @@ use std::collections::HashMap;use serde::Deserialize;-use flowy_server_config::af_cloud_config::AFCloudConfiguration;-use flowy_server_config::supabase_config::SupabaseConfiguration;-use flowy_server_config::AuthenticatorType;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;+use flowy_server_pub::AuthenticatorType;#[derive(Deserialize, Debug)]pub struct AppFlowyDartConfiguration {diff --git a/frontend/rust-lib/dart-ffi/src/lib.rs b/frontend/rust-lib/dart-ffi/src/lib.rsindex f73c679053..2e0b6b137a 100644--- a/frontend/rust-lib/dart-ffi/src/lib.rs+++ b/frontend/rust-lib/dart-ffi/src/lib.rs@@ -10,7 +10,7 @@ use tracing::{error, trace};use flowy_core::config::AppFlowyCoreConfig;use flowy_core::*;use flowy_notification::{register_notification_sender, unregister_all_notification_sender};-use flowy_server_config::AuthenticatorType;+use flowy_server_pub::AuthenticatorType;use lib_dispatch::prelude::ToBytes;use lib_dispatch::prelude::*;diff --git a/frontend/rust-lib/event-integration/Cargo.toml b/frontend/rust-lib/event-integration/Cargo.tomlindex 18347402eb..0b35d019d3 100644--- a/frontend/rust-lib/event-integration/Cargo.toml+++ b/frontend/rust-lib/event-integration/Cargo.toml@@ -8,18 +8,18 @@ edition = "2018"[dependencies]flowy-core = { workspace = true }flowy-user = { workspace = true }-flowy-user-deps = { workspace = true }+flowy-user-pub = { workspace = true }flowy-folder = { path = "../flowy-folder", features = ["test_helper"] }-flowy-folder-deps = { workspace = true }+flowy-folder-pub = { workspace = true }flowy-database2 = { path = "../flowy-database2" }-flowy-database-deps = { workspace = true }+flowy-database-pub = { workspace = true }flowy-document = { path = "../flowy-document" }-flowy-document-deps = { workspace = true }+flowy-document-pub = { workspace = true }flowy-encrypt = { workspace = true }lib-dispatch = { workspace = true }lib-infra = { workspace = true }flowy-server = { path = "../flowy-server" }-flowy-server-config = { workspace = true }+flowy-server-pub = { workspace = true }flowy-notification = { workspace = true }anyhow.workspace = trueflowy-storage = { workspace = true }diff --git a/frontend/rust-lib/event-integration/src/user_event.rs b/frontend/rust-lib/event-integration/src/user_event.rsindex 1bcfd08f0b..bfc3ac1ce4 100644--- a/frontend/rust-lib/event-integration/src/user_event.rs+++ b/frontend/rust-lib/event-integration/src/user_event.rs@@ -14,8 +14,8 @@ use uuid::Uuid;use flowy_notification::entities::SubscribeObject;use flowy_notification::NotificationSender;use flowy_server::supabase::define::{USER_DEVICE_ID, USER_EMAIL, USER_SIGN_IN_URL, USER_UUID};-use flowy_server_config::af_cloud_config::AFCloudConfiguration;-use flowy_server_config::AuthenticatorType;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::AuthenticatorType;use flowy_user::entities::{AuthenticatorPB, CloudSettingPB, OauthSignInPB, SignInUrlPB, SignInUrlPayloadPB, SignUpPayloadPB,UpdateCloudConfigPB, UpdateUserProfilePayloadPB, UserProfilePB,diff --git a/frontend/rust-lib/event-integration/tests/util.rs b/frontend/rust-lib/event-integration/tests/util.rsindex 37364765a9..1eac411d23 100644--- a/frontend/rust-lib/event-integration/tests/util.rs+++ b/frontend/rust-lib/event-integration/tests/util.rs@@ -18,17 +18,17 @@ use zip::ZipArchive;use event_integration::event_builder::EventBuilder;use event_integration::Cleaner;use event_integration::EventIntegrationTest;-use flowy_database_deps::cloud::DatabaseCloudService;-use flowy_folder_deps::cloud::{FolderCloudService, FolderSnapshot};+use flowy_database_pub::cloud::DatabaseCloudService;+use flowy_folder_pub::cloud::{FolderCloudService, FolderSnapshot};use flowy_server::supabase::api::*;use flowy_server::{AppFlowyEncryption, EncryptionImpl};-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use flowy_user::entities::{AuthenticatorPB, UpdateUserProfilePayloadPB};use flowy_user::errors::FlowyError;use flowy_user::event_map::UserEvent::*;-use flowy_user_deps::cloud::UserCloudService;-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::cloud::UserCloudService;+use flowy_user_pub::entities::Authenticator;pub fn get_supabase_config() -> Option<SupabaseConfiguration> {dotenv::from_path(".env.ci").ok()?;diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.tomlindex f601fb26b0..3c97ee5f7d 100644--- a/frontend/rust-lib/flowy-core/Cargo.toml+++ b/frontend/rust-lib/flowy-core/Cargo.toml@@ -9,18 +9,17 @@ edition = "2018"lib-dispatch = { workspace = true }lib-log = { workspace = true }flowy-user = { workspace = true }-flowy-user-deps = { workspace = true }+flowy-user-pub = { workspace = true }flowy-folder = { workspace = true }-flowy-folder-deps = { workspace = true }+flowy-folder-pub = { workspace = true }flowy-database2 = { workspace = true }-flowy-database-deps = { workspace = true }+flowy-database-pub = { workspace = true }flowy-sqlite = { workspace = true }flowy-document = { workspace = true }-flowy-document-deps = { workspace = true }+flowy-document-pub = { workspace = true }flowy-error = { workspace = true }-flowy-task = { workspace = true }flowy-server = { workspace = true }-flowy-server-config = { workspace = true }+flowy-server-pub = { workspace = true }flowy-config = { workspace = true }flowy-date = { workspace = true }collab-integrate = { workspace = true }diff --git a/frontend/rust-lib/flowy-core/src/config.rs b/frontend/rust-lib/flowy-core/src/config.rsindex aa5b5cf053..f298aa46e6 100644--- a/frontend/rust-lib/flowy-core/src/config.rs+++ b/frontend/rust-lib/flowy-core/src/config.rs@@ -4,8 +4,8 @@ use std::path::Path;use base64::Engine;use tracing::{error, info};-use flowy_server_config::af_cloud_config::AFCloudConfiguration;-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use flowy_user::services::entities::URL_SAFE_ENGINE;use lib_infra::file_util::copy_dir_recursive;diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rsindex 038e27ca0f..1ec5c144ee 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs@@ -7,7 +7,7 @@ use flowy_sqlite::{prelude::*,schema::{collab_snapshot, collab_snapshot::dsl},};-use flowy_user::manager::UserManager;+use flowy_user::user_manager::UserManager;use lib_infra::util::timestamp;use std::sync::Weak;use tracing::debug;diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rsindex 2fe869a516..138cb8b4f8 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs@@ -5,10 +5,10 @@ use tokio::sync::RwLock;use collab_integrate::collab_builder::AppFlowyCollabBuilder;use collab_integrate::CollabKVDB;use flowy_database2::{DatabaseManager, DatabaseUser};-use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_database_pub::cloud::DatabaseCloudService;use flowy_error::FlowyError;-use flowy_task::TaskDispatcher;-use flowy_user::manager::UserManager;+use flowy_user::user_manager::UserManager;+use lib_infra::priority_task::TaskDispatcher;pub struct DatabaseDepsResolver();diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rsindex 650d59122e..870a7ce43f 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs@@ -6,10 +6,10 @@ use collab_integrate::CollabKVDB;use flowy_database2::DatabaseManager;use flowy_document::entities::{DocumentSnapshotData, DocumentSnapshotMeta};use flowy_document::manager::{DocumentManager, DocumentSnapshotService, DocumentUserService};-use flowy_document_deps::cloud::DocumentCloudService;+use flowy_document_pub::cloud::DocumentCloudService;use flowy_error::{FlowyError, FlowyResult};use flowy_storage::FileStorageService;-use flowy_user::manager::UserManager;+use flowy_user::user_manager::UserManager;pub struct DocumentDepsResolver();impl DocumentDepsResolver {diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rsindex 297340f14e..ecdb5096ac 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs@@ -22,10 +22,10 @@ use flowy_folder::share::ImportType;use flowy_folder::view_operation::{FolderOperationHandler, FolderOperationHandlers, View};use flowy_folder::ViewLayout;-use flowy_folder_deps::entities::ImportData;-use flowy_folder_deps::folder_builder::{ParentChildViews, WorkspaceViewBuilder};-use flowy_user::manager::UserManager;+use flowy_folder_pub::entities::ImportData;+use flowy_folder_pub::folder_builder::{ParentChildViews, WorkspaceViewBuilder};use flowy_user::services::data_import::ImportDataSource;+use flowy_user::user_manager::UserManager;use crate::integrate::server::ServerProvider;use lib_dispatch::prelude::ToBytes;diff --git a/frontend/rust-lib/flowy-core/src/integrate/collab_interact.rs b/frontend/rust-lib/flowy-core/src/integrate/collab_interact.rsindex 4cd7b2ceed..08f6a6a2c9 100644--- a/frontend/rust-lib/flowy-core/src/integrate/collab_interact.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/collab_interact.rs@@ -5,7 +5,7 @@ use std::sync::Weak;use flowy_database2::DatabaseManager;use flowy_document::manager::DocumentManager;use flowy_document::reminder::{DocumentReminder, DocumentReminderAction};-use flowy_folder_deps::cloud::Error;+use flowy_folder_pub::cloud::Error;use flowy_user::services::collab_interact::CollabInteract;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-core/src/integrate/log.rs b/frontend/rust-lib/flowy-core/src/integrate/log.rsindex ff58d40643..7a66353275 100644--- a/frontend/rust-lib/flowy-core/src/integrate/log.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/log.rs@@ -32,7 +32,6 @@ pub(crate) fn create_log_filter(level: String, with_crates: Vec<String>) -> Strifilters.push(format!("flowy_server={}", level));filters.push(format!("flowy_notification={}", "info"));filters.push(format!("lib_infra={}", level));- filters.push(format!("flowy_task={}", level));// filters.push(format!("lib_dispatch={}", level));filters.push(format!("dart_ffi={}", "info"));diff --git a/frontend/rust-lib/flowy-core/src/integrate/server.rs b/frontend/rust-lib/flowy-core/src/integrate/server.rsindex 04c7a461dd..d65873c11f 100644--- a/frontend/rust-lib/flowy-core/src/integrate/server.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/server.rs@@ -10,11 +10,11 @@ use flowy_server::af_cloud::AppFlowyCloudServer;use flowy_server::local_server::{LocalServer, LocalServerDB};use flowy_server::supabase::SupabaseServer;use flowy_server::{AppFlowyEncryption, AppFlowyServer, EncryptionImpl};-use flowy_server_config::af_cloud_config::AFCloudConfiguration;-use flowy_server_config::supabase_config::SupabaseConfiguration;-use flowy_server_config::AuthenticatorType;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;+use flowy_server_pub::AuthenticatorType;use flowy_sqlite::kv::StorePreferences;-use flowy_user_deps::entities::*;+use flowy_user_pub::entities::*;use crate::AppFlowyCoreConfig;diff --git a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rsindex 31757dabfa..f64085b212 100644--- a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs@@ -14,18 +14,18 @@ use tracing::{debug, instrument};use collab_integrate::collab_builder::{CollabCloudPluginProvider, CollabPluginProviderContext, CollabPluginProviderType,};-use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};+use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};use flowy_document::deps::DocumentData;-use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};+use flowy_document_pub::cloud::{DocumentCloudService, DocumentSnapshot};use flowy_error::FlowyError;-use flowy_folder_deps::cloud::{+use flowy_folder_pub::cloud::{FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace, WorkspaceRecord,};-use flowy_server_config::af_cloud_config::AFCloudConfiguration;-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use flowy_storage::{FileStorageService, StorageObject};-use flowy_user_deps::cloud::{UserCloudService, UserCloudServiceProvider};-use flowy_user_deps::entities::{Authenticator, UserTokenState};+use flowy_user_pub::cloud::{UserCloudService, UserCloudServiceProvider};+use flowy_user_pub::entities::{Authenticator, UserTokenState};use lib_infra::future::{to_fut, Fut, FutureResult};use crate::integrate::server::{Server, ServerProvider};diff --git a/frontend/rust-lib/flowy-core/src/integrate/user.rs b/frontend/rust-lib/flowy-core/src/integrate/user.rsindex f1f1948496..af48d79c54 100644--- a/frontend/rust-lib/flowy-core/src/integrate/user.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/user.rs@@ -10,8 +10,8 @@ use flowy_document::manager::DocumentManager;use flowy_error::FlowyResult;use flowy_folder::manager::{FolderInitDataSource, FolderManager};use flowy_user::event_map::UserStatusCallback;-use flowy_user_deps::cloud::{UserCloudConfig, UserCloudServiceProvider};-use flowy_user_deps::entities::{Authenticator, UserProfile, UserWorkspace};+use flowy_user_pub::cloud::{UserCloudConfig, UserCloudServiceProvider};+use flowy_user_pub::entities::{Authenticator, UserProfile, UserWorkspace};use lib_infra::future::{to_fut, Fut};use crate::integrate::server::{Server, ServerProvider};diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rsindex 576304d9b9..811d8bb165 100644--- a/frontend/rust-lib/flowy-core/src/lib.rs+++ b/frontend/rust-lib/flowy-core/src/lib.rs@@ -13,13 +13,13 @@ use flowy_document::manager::DocumentManager;use flowy_folder::manager::FolderManager;use flowy_sqlite::kv::StorePreferences;use flowy_storage::FileStorageService;-use flowy_task::{TaskDispatcher, TaskRunner};-use flowy_user::manager::UserManager;use flowy_user::services::entities::UserConfig;-use flowy_user_deps::cloud::UserCloudServiceProvider;+use flowy_user::user_manager::UserManager;+use flowy_user_pub::cloud::UserCloudServiceProvider;use lib_dispatch::prelude::*;use lib_dispatch::runtime::AFPluginRuntime;+use lib_infra::priority_task::{TaskDispatcher, TaskRunner};use module::make_plugins;use crate::config::AppFlowyCoreConfig;diff --git a/frontend/rust-lib/flowy-core/src/module.rs b/frontend/rust-lib/flowy-core/src/module.rsindex ec90897670..d76262a054 100644--- a/frontend/rust-lib/flowy-core/src/module.rs+++ b/frontend/rust-lib/flowy-core/src/module.rs@@ -3,7 +3,7 @@ use std::sync::Weak;use flowy_database2::DatabaseManager;use flowy_document::manager::DocumentManager as DocumentManager2;use flowy_folder::manager::FolderManager;-use flowy_user::manager::UserManager;+use flowy_user::user_manager::UserManager;use lib_dispatch::prelude::AFPlugin;pub fn make_plugins(diff --git a/frontend/rust-lib/flowy-database-deps/Cargo.toml b/frontend/rust-lib/flowy-database-pub/Cargo.tomlsimilarity index 83%rename from frontend/rust-lib/flowy-database-deps/Cargo.tomlrename to frontend/rust-lib/flowy-database-pub/Cargo.tomlindex 3c8e2d3f0c..2592795a13 100644--- a/frontend/rust-lib/flowy-database-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-database-pub/Cargo.toml@@ -1,5 +1,5 @@[package]-name = "flowy-database-deps"+name = "flowy-database-pub"version = "0.1.0"edition = "2021"diff --git a/frontend/rust-lib/flowy-database-deps/src/cloud.rs b/frontend/rust-lib/flowy-database-pub/src/cloud.rssimilarity index 100%rename from frontend/rust-lib/flowy-database-deps/src/cloud.rsrename to frontend/rust-lib/flowy-database-pub/src/cloud.rsdiff --git a/frontend/rust-lib/flowy-database-deps/src/lib.rs b/frontend/rust-lib/flowy-database-pub/src/lib.rssimilarity index 100%rename from frontend/rust-lib/flowy-database-deps/src/lib.rsrename to frontend/rust-lib/flowy-database-pub/src/lib.rsdiff --git a/frontend/rust-lib/flowy-database2/Cargo.toml b/frontend/rust-lib/flowy-database2/Cargo.tomlindex af99a6add9..79d52f224a 100644--- a/frontend/rust-lib/flowy-database2/Cargo.toml+++ b/frontend/rust-lib/flowy-database2/Cargo.toml@@ -10,7 +10,7 @@ collab = { version = "0.1.0" }collab-database = { version = "0.1.0" }collab-entity = { version = "0.1.0" }collab-integrate = { workspace = true }-flowy-database-deps = { workspace = true }+flowy-database-pub = { workspace = true }flowy-derive.workspace = trueflowy-notification = { workspace = true }@@ -19,7 +19,6 @@ protobuf.workspace = trueflowy-error = { workspace = true, features = ["impl_from_dispatch_error", "impl_from_collab"]}lib-dispatch = { workspace = true }tokio = { workspace = true, features = ["sync"] }-flowy-task= { workspace = true }bytes.workspace = truetracing.workspace = trueserde.workspace = truediff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex a9565bcf7f..2d7e67b113 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -18,10 +18,10 @@ use tracing::{event, instrument, trace};use collab_integrate::collab_builder::{AppFlowyCollabBuilder, CollabBuilderConfig};use collab_integrate::{CollabKVAction, CollabKVDB, CollabPersistenceConfig};-use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_database_pub::cloud::DatabaseCloudService;use flowy_error::{internal_error, FlowyError, FlowyResult};-use flowy_task::TaskDispatcher;use lib_dispatch::prelude::af_spawn;+use lib_infra::priority_task::TaskDispatcher;use crate::entities::{DatabaseDescriptionPB, DatabaseLayoutPB, DatabaseSnapshotPB, DidFetchRowPB,diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rsindex e4797b4a37..6c552aa573 100644--- a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs@@ -10,9 +10,9 @@ use tokio::sync::{broadcast, RwLock};use tracing::{event, warn};use flowy_error::{internal_error, ErrorCode, FlowyError, FlowyResult};-use flowy_task::TaskDispatcher;use lib_dispatch::prelude::af_spawn;use lib_infra::future::{to_fut, Fut, FutureResult};+use lib_infra::priority_task::TaskDispatcher;use crate::entities::*;use crate::notification::{send_notification, DatabaseNotification};diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rsindex 46bb5d4cd7..9c525ed3d6 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs@@ -8,8 +8,8 @@ use collab_database::views::{DatabaseLayout, DatabaseView, LayoutSetting};use tokio::sync::RwLock;use flowy_error::FlowyError;-use flowy_task::TaskDispatcher;use lib_infra::future::{Fut, FutureResult};+use lib_infra::priority_task::TaskDispatcher;use crate::entities::{FieldType, FieldVisibility};use crate::services::field::TypeOptionCellDataHandler;diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rsindex 8cbffd62f5..00df750906 100644--- a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs@@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize};use tokio::sync::RwLock;use flowy_error::FlowyResult;-use flowy_task::{QualityOfService, Task, TaskContent, TaskDispatcher};use lib_infra::future::Fut;+use lib_infra::priority_task::{QualityOfService, Task, TaskContent, TaskDispatcher};use crate::entities::filter_entities::*;use crate::entities::{FieldType, InsertedRowPB, RowMetaPB};diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/task.rs b/frontend/rust-lib/flowy-database2/src/services/filter/task.rsindex f53a0554a2..dbf55776df 100644--- a/frontend/rust-lib/flowy-database2/src/services/filter/task.rs+++ b/frontend/rust-lib/flowy-database2/src/services/filter/task.rs@@ -1,6 +1,6 @@use crate::services::filter::FilterController;-use flowy_task::{TaskContent, TaskHandler};use lib_infra::future::BoxResultFuture;+use lib_infra::priority_task::{TaskContent, TaskHandler};use std::collections::HashMap;use std::sync::Arc;diff --git a/frontend/rust-lib/flowy-database2/src/services/sort/controller.rs b/frontend/rust-lib/flowy-database2/src/services/sort/controller.rsindex 50bad3eb45..31e10d084b 100644--- a/frontend/rust-lib/flowy-database2/src/services/sort/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/sort/controller.rs@@ -10,8 +10,8 @@ use serde::{Deserialize, Serialize};use tokio::sync::RwLock;use flowy_error::FlowyResult;-use flowy_task::{QualityOfService, Task, TaskContent, TaskDispatcher};use lib_infra::future::Fut;+use lib_infra::priority_task::{QualityOfService, Task, TaskContent, TaskDispatcher};use crate::entities::FieldType;use crate::entities::SortChangesetNotificationPB;diff --git a/frontend/rust-lib/flowy-database2/src/services/sort/task.rs b/frontend/rust-lib/flowy-database2/src/services/sort/task.rsindex 9bac020e8d..107f318dec 100644--- a/frontend/rust-lib/flowy-database2/src/services/sort/task.rs+++ b/frontend/rust-lib/flowy-database2/src/services/sort/task.rs@@ -1,6 +1,6 @@use crate::services::sort::SortController;-use flowy_task::{TaskContent, TaskHandler};use lib_infra::future::BoxResultFuture;+use lib_infra::priority_task::{TaskContent, TaskHandler};use std::sync::Arc;use tokio::sync::RwLock;diff --git a/frontend/rust-lib/flowy-document-deps/Cargo.toml b/frontend/rust-lib/flowy-document-pub/Cargo.tomlsimilarity index 83%rename from frontend/rust-lib/flowy-document-deps/Cargo.tomlrename to frontend/rust-lib/flowy-document-pub/Cargo.tomlindex c74aca434b..0573d4339f 100644--- a/frontend/rust-lib/flowy-document-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-document-pub/Cargo.toml@@ -1,5 +1,5 @@[package]-name = "flowy-document-deps"+name = "flowy-document-pub"version = "0.1.0"edition = "2021"diff --git a/frontend/rust-lib/flowy-document-deps/src/cloud.rs b/frontend/rust-lib/flowy-document-pub/src/cloud.rssimilarity index 100%rename from frontend/rust-lib/flowy-document-deps/src/cloud.rsrename to frontend/rust-lib/flowy-document-pub/src/cloud.rsdiff --git a/frontend/rust-lib/flowy-document-deps/src/lib.rs b/frontend/rust-lib/flowy-document-pub/src/lib.rssimilarity index 100%rename from frontend/rust-lib/flowy-document-deps/src/lib.rsrename to frontend/rust-lib/flowy-document-pub/src/lib.rsdiff --git a/frontend/rust-lib/flowy-document/Cargo.toml b/frontend/rust-lib/flowy-document/Cargo.tomlindex 1c2d789ec2..6a684ef9e0 100644--- a/frontend/rust-lib/flowy-document/Cargo.toml+++ b/frontend/rust-lib/flowy-document/Cargo.toml@@ -12,7 +12,7 @@ collab = { version = "0.1.0" }collab-document = { version = "0.1.0" }collab-entity = { version = "0.1.0" }collab-integrate = { workspace = true }-flowy-document-deps = { workspace = true }+flowy-document-pub = { workspace = true }flowy-storage = { workspace = true }flowy-derive.workspace = trueflowy-notification = { workspace = true }diff --git a/frontend/rust-lib/flowy-document/src/manager.rs b/frontend/rust-lib/flowy-document/src/manager.rsindex b711c738a5..972d267f5b 100644--- a/frontend/rust-lib/flowy-document/src/manager.rs+++ b/frontend/rust-lib/flowy-document/src/manager.rs@@ -16,7 +16,7 @@ use tracing::{event, instrument};use collab_integrate::collab_builder::{AppFlowyCollabBuilder, CollabBuilderConfig};use collab_integrate::{CollabKVAction, CollabKVDB, CollabPersistenceConfig};-use flowy_document_deps::cloud::DocumentCloudService;+use flowy_document_pub::cloud::DocumentCloudService;use flowy_error::{internal_error, ErrorCode, FlowyError, FlowyResult};use flowy_storage::FileStorageService;diff --git a/frontend/rust-lib/flowy-document/tests/document/util.rs b/frontend/rust-lib/flowy-document/tests/document/util.rsindex b20494f059..8f38d4777d 100644--- a/frontend/rust-lib/flowy-document/tests/document/util.rs+++ b/frontend/rust-lib/flowy-document/tests/document/util.rs@@ -21,7 +21,7 @@ use collab_integrate::CollabKVDB;use flowy_document::document::MutexDocument;use flowy_document::entities::{DocumentSnapshotData, DocumentSnapshotMeta};use flowy_document::manager::{DocumentManager, DocumentSnapshotService, DocumentUserService};-use flowy_document_deps::cloud::*;+use flowy_document_pub::cloud::*;use flowy_error::{ErrorCode, FlowyError, FlowyResult};use flowy_storage::{FileStorageService, StorageObject};use lib_infra::async_trait::async_trait;diff --git a/frontend/rust-lib/flowy-folder-deps/Cargo.toml b/frontend/rust-lib/flowy-folder-pub/Cargo.tomlsimilarity index 93%rename from frontend/rust-lib/flowy-folder-deps/Cargo.tomlrename to frontend/rust-lib/flowy-folder-pub/Cargo.tomlindex ba9d660d67..6b6e960e7c 100644--- a/frontend/rust-lib/flowy-folder-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-folder-pub/Cargo.toml@@ -1,5 +1,5 @@[package]-name = "flowy-folder-deps"+name = "flowy-folder-pub"version = "0.1.0"edition = "2021"diff --git a/frontend/rust-lib/flowy-folder-deps/src/cloud.rs b/frontend/rust-lib/flowy-folder-pub/src/cloud.rssimilarity index 100%rename from frontend/rust-lib/flowy-folder-deps/src/cloud.rsrename to frontend/rust-lib/flowy-folder-pub/src/cloud.rsdiff --git a/frontend/rust-lib/flowy-folder-deps/src/entities.rs b/frontend/rust-lib/flowy-folder-pub/src/entities.rssimilarity index 100%rename from frontend/rust-lib/flowy-folder-deps/src/entities.rsrename to frontend/rust-lib/flowy-folder-pub/src/entities.rsdiff --git a/frontend/rust-lib/flowy-folder-deps/src/folder_builder.rs b/frontend/rust-lib/flowy-folder-pub/src/folder_builder.rssimilarity index 100%rename from frontend/rust-lib/flowy-folder-deps/src/folder_builder.rsrename to frontend/rust-lib/flowy-folder-pub/src/folder_builder.rsdiff --git a/frontend/rust-lib/flowy-folder-deps/src/lib.rs b/frontend/rust-lib/flowy-folder-pub/src/lib.rssimilarity index 100%rename from frontend/rust-lib/flowy-folder-deps/src/lib.rsrename to frontend/rust-lib/flowy-folder-pub/src/lib.rsdiff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.tomlindex ef37fe88cc..73df96f37c 100644--- a/frontend/rust-lib/flowy-folder/Cargo.toml+++ b/frontend/rust-lib/flowy-folder/Cargo.toml@@ -10,7 +10,7 @@ collab = { version = "0.1.0" }collab-folder = { version = "0.1.0" }collab-entity = { version = "0.1.0" }collab-integrate = { workspace = true }-flowy-folder-deps = { workspace = true }+flowy-folder-pub = { workspace = true }flowy-derive.workspace = trueflowy-notification = { workspace = true }diff --git a/frontend/rust-lib/flowy-folder/src/entities/view.rs b/frontend/rust-lib/flowy-folder/src/entities/view.rsindex 14bc8a759a..88d8187d39 100644--- a/frontend/rust-lib/flowy-folder/src/entities/view.rs+++ b/frontend/rust-lib/flowy-folder/src/entities/view.rs@@ -7,7 +7,7 @@ use collab_folder::{View, ViewLayout};use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_error::ErrorCode;-use flowy_folder_deps::cloud::gen_view_id;+use flowy_folder_pub::cloud::gen_view_id;use crate::entities::icon::ViewIconPB;use crate::entities::parser::view::{ViewDesc, ViewIdentify, ViewName, ViewThumbnail};diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rsindex 709cca1735..5515fbd3ab 100644--- a/frontend/rust-lib/flowy-folder/src/manager.rs+++ b/frontend/rust-lib/flowy-folder/src/manager.rs@@ -13,8 +13,8 @@ use tracing::{error, event, info, instrument, Level};use collab_integrate::collab_builder::{AppFlowyCollabBuilder, CollabBuilderConfig};use collab_integrate::{CollabKVDB, CollabPersistenceConfig};use flowy_error::{internal_error, ErrorCode, FlowyError, FlowyResult};-use flowy_folder_deps::cloud::{gen_view_id, FolderCloudService};-use flowy_folder_deps::folder_builder::ParentChildViews;+use flowy_folder_pub::cloud::{gen_view_id, FolderCloudService};+use flowy_folder_pub::folder_builder::ParentChildViews;use lib_infra::async_trait::async_trait;use crate::entities::icon::UpdateViewIconParams;diff --git a/frontend/rust-lib/flowy-folder/src/test_helper.rs b/frontend/rust-lib/flowy-folder/src/test_helper.rsindex 7cfa2fd0cd..b63448bc94 100644--- a/frontend/rust-lib/flowy-folder/src/test_helper.rs+++ b/frontend/rust-lib/flowy-folder/src/test_helper.rs@@ -1,6 +1,6 @@use std::collections::HashMap;-use flowy_folder_deps::cloud::gen_view_id;+use flowy_folder_pub::cloud::gen_view_id;use crate::entities::{CreateViewParams, ViewLayoutPB};use crate::manager::FolderManager;diff --git a/frontend/rust-lib/flowy-folder/src/user_default.rs b/frontend/rust-lib/flowy-folder/src/user_default.rsindex ffab666e52..be2e4c3cf4 100644--- a/frontend/rust-lib/flowy-folder/src/user_default.rs+++ b/frontend/rust-lib/flowy-folder/src/user_default.rs@@ -1,7 +1,7 @@use std::sync::Arc;use collab_folder::{FolderData, RepeatedViewIdentifier, ViewIdentifier, Workspace};-use flowy_folder_deps::folder_builder::{FlattedViews, ParentChildViews, WorkspaceViewBuilder};+use flowy_folder_pub::folder_builder::{FlattedViews, ParentChildViews, WorkspaceViewBuilder};use tokio::sync::RwLock;use lib_infra::util::timestamp;diff --git a/frontend/rust-lib/flowy-folder/src/util.rs b/frontend/rust-lib/flowy-folder/src/util.rsindex c40743c0b1..cc57997202 100644--- a/frontend/rust-lib/flowy-folder/src/util.rs+++ b/frontend/rust-lib/flowy-folder/src/util.rs@@ -3,7 +3,7 @@ use std::sync::Arc;use collab_integrate::CollabKVAction;use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_folder_deps::folder_builder::ParentChildViews;+use flowy_folder_pub::folder_builder::ParentChildViews;use crate::entities::UserFolderPB;use crate::manager::FolderUser;diff --git a/frontend/rust-lib/flowy-folder/src/view_operation.rs b/frontend/rust-lib/flowy-folder/src/view_operation.rsindex 1f4bbc4245..c5472c9725 100644--- a/frontend/rust-lib/flowy-folder/src/view_operation.rs+++ b/frontend/rust-lib/flowy-folder/src/view_operation.rs@@ -8,7 +8,7 @@ use tokio::sync::RwLock;use flowy_error::FlowyError;-use flowy_folder_deps::folder_builder::WorkspaceViewBuilder;+use flowy_folder_pub::folder_builder::WorkspaceViewBuilder;use lib_infra::future::FutureResult;use lib_infra::util::timestamp;diff --git a/frontend/rust-lib/flowy-server-config/Cargo.toml b/frontend/rust-lib/flowy-server-pub/Cargo.tomlsimilarity index 89%rename from frontend/rust-lib/flowy-server-config/Cargo.tomlrename to frontend/rust-lib/flowy-server-pub/Cargo.tomlindex 118b7fc711..5a59b5ccae 100644--- a/frontend/rust-lib/flowy-server-config/Cargo.toml+++ b/frontend/rust-lib/flowy-server-pub/Cargo.toml@@ -1,5 +1,5 @@[package]-name = "flowy-server-config"+name = "flowy-server-pub"version = "0.1.0"edition = "2021"diff --git a/frontend/rust-lib/flowy-server-config/src/af_cloud_config.rs b/frontend/rust-lib/flowy-server-pub/src/af_cloud_config.rssimilarity index 100%rename from frontend/rust-lib/flowy-server-config/src/af_cloud_config.rsrename to frontend/rust-lib/flowy-server-pub/src/af_cloud_config.rsdiff --git a/frontend/rust-lib/flowy-server-config/src/lib.rs b/frontend/rust-lib/flowy-server-pub/src/lib.rssimilarity index 100%rename from frontend/rust-lib/flowy-server-config/src/lib.rsrename to frontend/rust-lib/flowy-server-pub/src/lib.rsdiff --git a/frontend/rust-lib/flowy-server-config/src/supabase_config.rs b/frontend/rust-lib/flowy-server-pub/src/supabase_config.rssimilarity index 100%rename from frontend/rust-lib/flowy-server-config/src/supabase_config.rsrename to frontend/rust-lib/flowy-server-pub/src/supabase_config.rsdiff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.tomlindex ea2177091f..c9bbb84e68 100644--- a/frontend/rust-lib/flowy-server/Cargo.toml+++ b/frontend/rust-lib/flowy-server/Cargo.toml@@ -29,12 +29,12 @@ collab-entity = { version = "0.1.0" }hex = "0.4.3"postgrest = "1.0"lib-infra = { workspace = true }-flowy-user-deps = { workspace = true }-flowy-folder-deps = { workspace = true }-flowy-database-deps = { workspace = true }-flowy-document-deps = { workspace = true }+flowy-user-pub = { workspace = true }+flowy-folder-pub = { workspace = true }+flowy-database-pub = { workspace = true }+flowy-document-pub = { workspace = true }flowy-error = { workspace = true, features = ["impl_from_postgres", "impl_from_serde", "impl_from_reqwest", "impl_from_url", "impl_from_appflowy_cloud"] }-flowy-server-config = { workspace = true }+flowy-server-pub = { workspace = true }flowy-encrypt = { workspace = true }flowy-storage = { workspace = true }mime_guess = "2.0"diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rsindex 0614669e38..48e1fd376d 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs@@ -7,7 +7,7 @@ use collab::core::collab_plugin::EncodedCollab;use collab_entity::CollabType;use tracing::error;-use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};+use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};use lib_infra::future::FutureResult;use crate::af_cloud::AFServer;diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rsindex 4dafa8b53c..2712d272d3 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs@@ -5,7 +5,7 @@ use collab::core::origin::CollabOrigin;use collab_document::document::Document;use collab_entity::CollabType;-use flowy_document_deps::cloud::*;+use flowy_document_pub::cloud::*;use flowy_error::FlowyError;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rsindex 0053024f60..de5b03c843 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs@@ -5,7 +5,7 @@ use collab::core::origin::CollabOrigin;use collab_entity::CollabType;use flowy_error::FlowyError;-use flowy_folder_deps::cloud::{+use flowy_folder_pub::cloud::{Folder, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace,WorkspaceRecord,};diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rsindex 9168e268ba..e1b1ae38bc 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs@@ -10,8 +10,8 @@ use collab_entity::CollabObject;use parking_lot::RwLock;use flowy_error::{ErrorCode, FlowyError};-use flowy_user_deps::cloud::{UserCloudService, UserCollabParams, UserUpdate, UserUpdateReceiver};-use flowy_user_deps::entities::*;+use flowy_user_pub::cloud::{UserCloudService, UserCollabParams, UserUpdate, UserUpdateReceiver};+use flowy_user_pub::entities::*;use lib_infra::box_any::BoxAny;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rsindex a81a7d24ea..689a3fc931 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs@@ -2,7 +2,7 @@ use anyhow::Error;use client_api::entity::auth_dto::{UpdateUserParams, UserMetaData};use client_api::entity::{AFRole, AFUserProfile, AFWorkspaceMember};-use flowy_user_deps::entities::{+use flowy_user_pub::entities::{Authenticator, Role, UpdateUserProfileParams, UserProfile, WorkspaceMember,USER_METADATA_ICON_URL, USER_METADATA_OPEN_AI_KEY, USER_METADATA_STABILITY_AI_KEY,};diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/util.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/util.rsindex b357861aa3..5ea94e3b6a 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/util.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/util.rs@@ -1,6 +1,6 @@use client_api::entity::AFUserProfile;-use flowy_user_deps::entities::EncryptionType;+use flowy_user_pub::entities::EncryptionType;pub fn encryption_type_from_profile(profile: &AFUserProfile) -> EncryptionType {match &profile.encryption_sign {diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/server.rs b/frontend/rust-lib/flowy-server/src/af_cloud/server.rsindex 8cacdf6005..e3ceeeb368 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/server.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/server.rs@@ -13,14 +13,14 @@ use tokio::sync::watch;use tokio_stream::wrappers::WatchStream;use tracing::{error, event, info};-use flowy_database_deps::cloud::DatabaseCloudService;-use flowy_document_deps::cloud::DocumentCloudService;+use flowy_database_pub::cloud::DatabaseCloudService;+use flowy_document_pub::cloud::DocumentCloudService;use flowy_error::{ErrorCode, FlowyError};-use flowy_folder_deps::cloud::FolderCloudService;-use flowy_server_config::af_cloud_config::AFCloudConfiguration;+use flowy_folder_pub::cloud::FolderCloudService;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;use flowy_storage::FileStorageService;-use flowy_user_deps::cloud::{UserCloudService, UserUpdate};-use flowy_user_deps::entities::UserTokenState;+use flowy_user_pub::cloud::{UserCloudService, UserUpdate};+use flowy_user_pub::entities::UserTokenState;use lib_dispatch::prelude::af_spawn;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/database.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/database.rsindex 421154069f..7560b24f94 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/database.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/database.rs@@ -2,7 +2,7 @@ use anyhow::Error;use collab::core::collab::CollabDocState;use collab_entity::CollabType;-use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};+use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};use lib_infra::future::FutureResult;pub(crate) struct LocalServerDatabaseCloudServiceImpl();diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/document.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/document.rsindex 97585f52b0..e22d36bc04 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/document.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/document.rs@@ -1,7 +1,7 @@use anyhow::Error;use collab::core::collab::CollabDocState;-use flowy_document_deps::cloud::*;+use flowy_document_pub::cloud::*;use flowy_error::{ErrorCode, FlowyError};use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rsindex 92ece33073..01efb5a51b 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs@@ -4,7 +4,7 @@ use anyhow::{anyhow, Error};use collab::core::collab::CollabDocState;use collab_entity::CollabType;-use flowy_folder_deps::cloud::{+use flowy_folder_pub::cloud::{gen_workspace_id, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace,WorkspaceRecord,};diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rsindex 99890647a1..7153af7e48 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs@@ -8,9 +8,9 @@ use parking_lot::Mutex;use uuid::Uuid;use flowy_error::FlowyError;-use flowy_user_deps::cloud::{UserCloudService, UserCollabParams};-use flowy_user_deps::entities::*;-use flowy_user_deps::DEFAULT_USER_NAME;+use flowy_user_pub::cloud::{UserCloudService, UserCollabParams};+use flowy_user_pub::entities::*;+use flowy_user_pub::DEFAULT_USER_NAME;use lib_infra::box_any::BoxAny;use lib_infra::future::FutureResult;use lib_infra::util::timestamp;diff --git a/frontend/rust-lib/flowy-server/src/local_server/server.rs b/frontend/rust-lib/flowy-server/src/local_server/server.rsindex 8215dae2f5..039e5113c7 100644--- a/frontend/rust-lib/flowy-server/src/local_server/server.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/server.rs@@ -3,16 +3,16 @@ use std::sync::Arc;use parking_lot::RwLock;use tokio::sync::mpsc;-use flowy_database_deps::cloud::DatabaseCloudService;-use flowy_document_deps::cloud::DocumentCloudService;+use flowy_database_pub::cloud::DatabaseCloudService;+use flowy_document_pub::cloud::DocumentCloudService;use flowy_error::FlowyError;-use flowy_folder_deps::cloud::FolderCloudService;+use flowy_folder_pub::cloud::FolderCloudService;use flowy_storage::FileStorageService;// use flowy_user::services::database::{// get_user_profile, get_user_workspace, open_collab_db, open_user_db,// };-use flowy_user_deps::cloud::UserCloudService;-use flowy_user_deps::entities::*;+use flowy_user_pub::cloud::UserCloudService;+use flowy_user_pub::entities::*;use crate::local_server::impls::{LocalServerDatabaseCloudServiceImpl, LocalServerDocumentCloudServiceImpl,diff --git a/frontend/rust-lib/flowy-server/src/server.rs b/frontend/rust-lib/flowy-server/src/server.rsindex 234d5e9474..60da0c43bf 100644--- a/frontend/rust-lib/flowy-server/src/server.rs+++ b/frontend/rust-lib/flowy-server/src/server.rs@@ -8,12 +8,12 @@ use collab_plugins::cloud_storage::RemoteCollabStorage;use parking_lot::RwLock;use tokio_stream::wrappers::WatchStream;-use flowy_database_deps::cloud::DatabaseCloudService;-use flowy_document_deps::cloud::DocumentCloudService;-use flowy_folder_deps::cloud::FolderCloudService;+use flowy_database_pub::cloud::DatabaseCloudService;+use flowy_document_pub::cloud::DocumentCloudService;+use flowy_folder_pub::cloud::FolderCloudService;use flowy_storage::FileStorageService;-use flowy_user_deps::cloud::UserCloudService;-use flowy_user_deps::entities::UserTokenState;+use flowy_user_pub::cloud::UserCloudService;+use flowy_user_pub::entities::UserTokenState;use lib_infra::future::FutureResult;pub trait AppFlowyEncryption: Send + Sync + 'static {diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/database.rs b/frontend/rust-lib/flowy-server/src/supabase/api/database.rsindex b91c081359..c18cd3635e 100644--- a/frontend/rust-lib/flowy-server/src/supabase/api/database.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/database.rs@@ -3,7 +3,7 @@ use collab::core::collab::CollabDocState;use collab_entity::CollabType;use tokio::sync::oneshot::channel;-use flowy_database_deps::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};+use flowy_database_pub::cloud::{CollabDocStateByOid, DatabaseCloudService, DatabaseSnapshot};use lib_dispatch::prelude::af_spawn;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/document.rs b/frontend/rust-lib/flowy-server/src/supabase/api/document.rsindex 47cfe11312..869421ea75 100644--- a/frontend/rust-lib/flowy-server/src/supabase/api/document.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/document.rs@@ -6,7 +6,7 @@ use collab_document::document::Document;use collab_entity::CollabType;use tokio::sync::oneshot::channel;-use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};+use flowy_document_pub::cloud::{DocumentCloudService, DocumentSnapshot};use flowy_error::FlowyError;use lib_dispatch::prelude::af_spawn;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs b/frontend/rust-lib/flowy-server/src/supabase/api/folder.rsindex 76b9d6a243..6b7f309af1 100644--- a/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs@@ -9,7 +9,7 @@ use serde_json::Value;use tokio::sync::oneshot::channel;use yrs::merge_updates_v1;-use flowy_folder_deps::cloud::{+use flowy_folder_pub::cloud::{gen_workspace_id, Folder, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot,Workspace, WorkspaceRecord,};diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs b/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rsindex f96c73c9f0..8db0910896 100644--- a/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs@@ -6,7 +6,7 @@ use parking_lot::RwLock;use postgrest::Postgrest;use flowy_error::{ErrorCode, FlowyError};-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use crate::AppFlowyEncryption;diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/request.rs b/frontend/rust-lib/flowy-server/src/supabase/api/request.rsindex 2162aeacbb..4dab453ddd 100644--- a/frontend/rust-lib/flowy-server/src/supabase/api/request.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/request.rs@@ -15,7 +15,7 @@ use tokio_retry::strategy::FixedInterval;use tokio_retry::{Action, Condition, RetryIf};use yrs::merge_updates_v1;-use flowy_database_deps::cloud::CollabDocStateByOid;+use flowy_database_pub::cloud::CollabDocStateByOid;use lib_infra::util::md5;use crate::response::ExtendedResponse;diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/user.rs b/frontend/rust-lib/flowy-server/src/supabase/api/user.rsindex be135ee4b5..7ef9c55b49 100644--- a/frontend/rust-lib/flowy-server/src/supabase/api/user.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/user.rs@@ -17,10 +17,10 @@ use tokio_retry::{Action, RetryIf};use uuid::Uuid;use flowy_error::FlowyError;-use flowy_folder_deps::cloud::{Folder, FolderData, Workspace};-use flowy_user_deps::cloud::*;-use flowy_user_deps::entities::*;-use flowy_user_deps::DEFAULT_USER_NAME;+use flowy_folder_pub::cloud::{Folder, FolderData, Workspace};+use flowy_user_pub::cloud::*;+use flowy_user_pub::entities::*;+use flowy_user_pub::DEFAULT_USER_NAME;use lib_dispatch::prelude::af_spawn;use lib_infra::box_any::BoxAny;use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/supabase/file_storage/core.rs b/frontend/rust-lib/flowy-server/src/supabase/file_storage/core.rsindex 76bc3bd4a6..edf30cda16 100644--- a/frontend/rust-lib/flowy-server/src/supabase/file_storage/core.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/file_storage/core.rs@@ -10,7 +10,7 @@ use url::Url;use flowy_encrypt::{decrypt_data, encrypt_data};use flowy_error::FlowyError;-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use flowy_storage::{FileStoragePlan, FileStorageService, StorageObject};use lib_infra::future::FutureResult;diff --git a/frontend/rust-lib/flowy-server/src/supabase/server.rs b/frontend/rust-lib/flowy-server/src/supabase/server.rsindex d0f0551c77..1143d7893c 100644--- a/frontend/rust-lib/flowy-server/src/supabase/server.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/server.rs@@ -5,12 +5,12 @@ use collab_entity::CollabObject;use collab_plugins::cloud_storage::{RemoteCollabStorage, RemoteUpdateSender};use parking_lot::RwLock;-use flowy_database_deps::cloud::DatabaseCloudService;-use flowy_document_deps::cloud::DocumentCloudService;-use flowy_folder_deps::cloud::FolderCloudService;-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_database_pub::cloud::DatabaseCloudService;+use flowy_document_pub::cloud::DocumentCloudService;+use flowy_folder_pub::cloud::FolderCloudService;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use flowy_storage::FileStorageService;-use flowy_user_deps::cloud::UserCloudService;+use flowy_user_pub::cloud::UserCloudService;use crate::supabase::api::{RESTfulPostgresServer, RealtimeCollabUpdateHandler, RealtimeEventHandler, RealtimeUserHandler,diff --git a/frontend/rust-lib/flowy-server/tests/af_cloud_test/user_test.rs b/frontend/rust-lib/flowy-server/tests/af_cloud_test/user_test.rsindex f336a913c0..a14d8eaf25 100644--- a/frontend/rust-lib/flowy-server/tests/af_cloud_test/user_test.rs+++ b/frontend/rust-lib/flowy-server/tests/af_cloud_test/user_test.rs@@ -1,5 +1,5 @@use flowy_server::AppFlowyServer;-use flowy_user_deps::entities::AuthResponse;+use flowy_user_pub::entities::AuthResponse;use lib_infra::box_any::BoxAny;use crate::af_cloud_test::util::{diff --git a/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs b/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rsindex a1f8a493d1..96957f1656 100644--- a/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs+++ b/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs@@ -6,7 +6,7 @@ use uuid::Uuid;use flowy_server::af_cloud::AppFlowyCloudServer;use flowy_server::supabase::define::{USER_DEVICE_ID, USER_SIGN_IN_URL};-use flowy_server_config::af_cloud_config::AFCloudConfiguration;+use flowy_server_pub::af_cloud_config::AFCloudConfiguration;use crate::setup_log;diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rsindex 3780ae3793..ad6d4eedf8 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rs@@ -1,7 +1,7 @@use collab_entity::{CollabObject, CollabType};use uuid::Uuid;-use flowy_user_deps::entities::AuthResponse;+use flowy_user_pub::entities::AuthResponse;use lib_infra::box_any::BoxAny;use crate::supabase_test::util::{diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rsindex 8e3e8ac3b3..a8a27ce4d5 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs@@ -6,7 +6,7 @@ use yrs::types::ToJson;use yrs::updates::decoder::Decode;use yrs::{merge_updates_v1, Array, Doc, Map, MapPrelim, ReadTxn, StateVector, Transact, Update};-use flowy_user_deps::entities::AuthResponse;+use flowy_user_pub::entities::AuthResponse;use lib_infra::box_any::BoxAny;use crate::supabase_test::util::{diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rsindex 9fbcc8d69b..0282685cb8 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs@@ -2,7 +2,7 @@ use uuid::Uuid;use flowy_encrypt::{encrypt_text, generate_encryption_secret};use flowy_error::FlowyError;-use flowy_user_deps::entities::*;+use flowy_user_pub::entities::*;use lib_infra::box_any::BoxAny;use crate::supabase_test::util::{diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/util.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/util.rsindex b0ab3028b1..97c5c9dfc6 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/util.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/util.rs@@ -6,9 +6,9 @@ use collab::core::origin::CollabOrigin;use collab_plugins::cloud_storage::RemoteCollabStorage;use uuid::Uuid;-use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_database_pub::cloud::DatabaseCloudService;use flowy_error::FlowyError;-use flowy_folder_deps::cloud::{Folder, FolderCloudService};+use flowy_folder_pub::cloud::{Folder, FolderCloudService};use flowy_server::supabase::api::{RESTfulPostgresServer, SupabaseCollabStorageImpl, SupabaseDatabaseServiceImpl,SupabaseFolderServiceImpl, SupabaseServerServiceImpl, SupabaseUserServiceImpl,@@ -16,9 +16,9 @@ use flowy_server::supabase::api::{use flowy_server::supabase::define::{USER_DEVICE_ID, USER_EMAIL, USER_UUID};use flowy_server::supabase::file_storage::core::SupabaseFileStorage;use flowy_server::{AppFlowyEncryption, EncryptionImpl};-use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_server_pub::supabase_config::SupabaseConfiguration;use flowy_storage::{FileStoragePlan, FileStorageService, StorageObject};-use flowy_user_deps::cloud::UserCloudService;+use flowy_user_pub::cloud::UserCloudService;use lib_infra::future::FutureResult;use crate::setup_log;diff --git a/frontend/rust-lib/flowy-task/Cargo.toml b/frontend/rust-lib/flowy-task/Cargo.tomldeleted file mode 100644index 79a08dfd6f..0000000000--- a/frontend/rust-lib/flowy-task/Cargo.toml+++ /dev/null@@ -1,19 +0,0 @@-[package]-name = "flowy-task"-version = "0.1.0"-edition = "2021"--# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html-[lib]-crate-type = ["cdylib", "rlib"]--[dependencies]-lib-infra = { workspace = true }-tokio = { workspace = true, features = ["sync", "macros"]}-atomic_refcell = "0.1.9"-anyhow.workspace = true-tracing.workspace = true--[dev-dependencies]-rand = "0.8.5"-futures.workspace = truediff --git a/frontend/rust-lib/flowy-user-deps/Cargo.toml b/frontend/rust-lib/flowy-user-pub/Cargo.tomlsimilarity index 92%rename from frontend/rust-lib/flowy-user-deps/Cargo.tomlrename to frontend/rust-lib/flowy-user-pub/Cargo.tomlindex cefb351713..df7ca6b09c 100644--- a/frontend/rust-lib/flowy-user-deps/Cargo.toml+++ b/frontend/rust-lib/flowy-user-pub/Cargo.toml@@ -1,5 +1,5 @@[package]-name = "flowy-user-deps"+name = "flowy-user-pub"version = "0.1.0"edition = "2021"diff --git a/frontend/rust-lib/flowy-user-deps/src/cloud.rs b/frontend/rust-lib/flowy-user-pub/src/cloud.rssimilarity index 100%rename from frontend/rust-lib/flowy-user-deps/src/cloud.rsrename to frontend/rust-lib/flowy-user-pub/src/cloud.rsdiff --git a/frontend/rust-lib/flowy-user-deps/src/entities.rs b/frontend/rust-lib/flowy-user-pub/src/entities.rssimilarity index 100%rename from frontend/rust-lib/flowy-user-deps/src/entities.rsrename to frontend/rust-lib/flowy-user-pub/src/entities.rsdiff --git a/frontend/rust-lib/flowy-user-deps/src/lib.rs b/frontend/rust-lib/flowy-user-pub/src/lib.rssimilarity index 99%rename from frontend/rust-lib/flowy-user-deps/src/lib.rsrename to frontend/rust-lib/flowy-user-pub/src/lib.rsindex 9bd8f89aaa..ff679f66fb 100644--- a/frontend/rust-lib/flowy-user-deps/src/lib.rs+++ b/frontend/rust-lib/flowy-user-pub/src/lib.rs@@ -1,3 +1,4 @@pub mod cloud;pub mod entities;+pub const DEFAULT_USER_NAME: fn() -> String = || "Me".to_string();diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.tomlindex 64bed114c4..1a57f2aad6 100644--- a/frontend/rust-lib/flowy-user/Cargo.toml+++ b/frontend/rust-lib/flowy-user/Cargo.toml@@ -10,10 +10,10 @@ flowy-derive.workspace = trueflowy-sqlite = { workspace = true, optional = true }flowy-encrypt = { workspace = true }flowy-error = { workspace = true, features = ["impl_from_sqlite", "impl_from_dispatch_error"] }-flowy-folder-deps = { workspace = true }+flowy-folder-pub = { workspace = true }lib-infra = { workspace = true }flowy-notification = { workspace = true }-flowy-server-config = { workspace = true }+flowy-server-pub = { workspace = true }lib-dispatch = { workspace = true }collab-integrate = { workspace = true }collab = { version = "0.1.0" }@@ -22,7 +22,7 @@ collab-document = { version = "0.1.0" }collab-database = { version = "0.1.0" }collab-user = { version = "0.1.0" }collab-entity = { version = "0.1.0" }-flowy-user-deps = { workspace = true }+flowy-user-pub = { workspace = true }anyhow.workspace = truetracing.workspace = truebytes.workspace = truediff --git a/frontend/rust-lib/flowy-user/src/anon_user/migrate_anon_user_collab.rs b/frontend/rust-lib/flowy-user/src/anon_user/migrate_anon_user_collab.rsindex 0c410abdb6..f28b71a2dc 100644--- a/frontend/rust-lib/flowy-user/src/anon_user/migrate_anon_user_collab.rs+++ b/frontend/rust-lib/flowy-user/src/anon_user/migrate_anon_user_collab.rs@@ -17,8 +17,8 @@ use tracing::info;use collab_integrate::{CollabKVAction, CollabKVDB, PersistenceError};use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_folder_deps::cloud::gen_view_id;-use flowy_user_deps::entities::Authenticator;+use flowy_folder_pub::cloud::gen_view_id;+use flowy_user_pub::entities::Authenticator;use crate::migrations::MigrationUser;diff --git a/frontend/rust-lib/flowy-user/src/anon_user/sync_af_user_collab.rs b/frontend/rust-lib/flowy-user/src/anon_user/sync_af_user_collab.rsindex 0b40dc3498..039daa3bae 100644--- a/frontend/rust-lib/flowy-user/src/anon_user/sync_af_user_collab.rs+++ b/frontend/rust-lib/flowy-user/src/anon_user/sync_af_user_collab.rs@@ -15,7 +15,7 @@ use parking_lot::Mutex;use collab_integrate::{CollabKVAction, CollabKVDB, PersistenceError};use flowy_error::FlowyResult;-use flowy_user_deps::cloud::UserCloudService;+use flowy_user_pub::cloud::UserCloudService;use crate::migrations::MigrationUser;diff --git a/frontend/rust-lib/flowy-user/src/anon_user/sync_supabase_user_collab.rs b/frontend/rust-lib/flowy-user/src/anon_user/sync_supabase_user_collab.rsindex aa82e6bc1a..64fa3ae978 100644--- a/frontend/rust-lib/flowy-user/src/anon_user/sync_supabase_user_collab.rs+++ b/frontend/rust-lib/flowy-user/src/anon_user/sync_supabase_user_collab.rs@@ -15,7 +15,7 @@ use parking_lot::Mutex;use collab_integrate::{CollabKVAction, CollabKVDB, PersistenceError};use flowy_error::FlowyResult;-use flowy_user_deps::cloud::UserCloudService;+use flowy_user_pub::cloud::UserCloudService;use crate::migrations::MigrationUser;diff --git a/frontend/rust-lib/flowy-user/src/entities/auth.rs b/frontend/rust-lib/flowy-user/src/entities/auth.rsindex 6a33d81b4b..8c808c5bc8 100644--- a/frontend/rust-lib/flowy-user/src/entities/auth.rs+++ b/frontend/rust-lib/flowy-user/src/entities/auth.rs@@ -2,7 +2,7 @@ use std::collections::HashMap;use std::convert::TryInto;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};-use flowy_user_deps::entities::*;+use flowy_user_pub::entities::*;use crate::entities::parser::*;use crate::errors::ErrorCode;diff --git a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs b/frontend/rust-lib/flowy-user/src/entities/user_profile.rsindex 241bd7510b..83bd86e1f4 100644--- a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs+++ b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs@@ -2,7 +2,7 @@ use std::convert::TryInto;use validator::Validate;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};-use flowy_user_deps::entities::*;+use flowy_user_pub::entities::*;use crate::entities::parser::{UserEmail, UserIcon, UserName, UserOpenaiKey, UserPassword};use crate::entities::AuthenticatorPB;diff --git a/frontend/rust-lib/flowy-user/src/entities/workspace_member.rs b/frontend/rust-lib/flowy-user/src/entities/workspace_member.rsindex e769db932c..e67a785133 100644--- a/frontend/rust-lib/flowy-user/src/entities/workspace_member.rs+++ b/frontend/rust-lib/flowy-user/src/entities/workspace_member.rs@@ -1,7 +1,7 @@use validator::Validate;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};-use flowy_user_deps::entities::{Role, WorkspaceMember};+use flowy_user_pub::entities::{Role, WorkspaceMember};use lib_infra::validator_fn::required_not_empty_str;#[derive(ProtoBuf, Default, Clone)]diff --git a/frontend/rust-lib/flowy-user/src/event_handler.rs b/frontend/rust-lib/flowy-user/src/event_handler.rsindex 51bfc5d67e..b091c0a7b3 100644--- a/frontend/rust-lib/flowy-user/src/event_handler.rs+++ b/frontend/rust-lib/flowy-user/src/event_handler.rs@@ -6,17 +6,17 @@ use tracing::event;use flowy_error::{ErrorCode, FlowyError, FlowyResult};use flowy_sqlite::kv::StorePreferences;-use flowy_user_deps::cloud::UserCloudConfig;-use flowy_user_deps::entities::*;+use flowy_user_pub::cloud::UserCloudConfig;+use flowy_user_pub::entities::*;use lib_dispatch::prelude::*;use lib_infra::box_any::BoxAny;use crate::entities::*;-use crate::manager::UserManager;use crate::notification::{send_notification, UserNotification};use crate::services::cloud_config::{get_cloud_config, get_or_create_cloud_config, save_cloud_config,};+use crate::user_manager::UserManager;fn upgrade_manager(manager: AFPluginState<Weak<UserManager>>) -> FlowyResult<Arc<UserManager>> {let manager = managerdiff --git a/frontend/rust-lib/flowy-user/src/event_map.rs b/frontend/rust-lib/flowy-user/src/event_map.rsindex 91c4f951fd..f10dc34eaf 100644--- a/frontend/rust-lib/flowy-user/src/event_map.rs+++ b/frontend/rust-lib/flowy-user/src/event_map.rs@@ -4,13 +4,13 @@ use strum_macros::Display;use flowy_derive::{Flowy_Event, ProtoBuf_Enum};use flowy_error::FlowyResult;-use flowy_user_deps::cloud::UserCloudConfig;-use flowy_user_deps::entities::*;+use flowy_user_pub::cloud::UserCloudConfig;+use flowy_user_pub::entities::*;use lib_dispatch::prelude::*;use lib_infra::future::{to_fut, Fut};use crate::event_handler::*;-use crate::manager::UserManager;+use crate::user_manager::UserManager;#[rustfmt::skip]pub fn init(user_session: Weak<UserManager>) -> AFPlugin {diff --git a/frontend/rust-lib/flowy-user/src/lib.rs b/frontend/rust-lib/flowy-user/src/lib.rsindex e5ba3bfbf7..08fd0a7ff8 100644--- a/frontend/rust-lib/flowy-user/src/lib.rs+++ b/frontend/rust-lib/flowy-user/src/lib.rs@@ -5,11 +5,11 @@ mod anon_user;pub mod entities;mod event_handler;pub mod event_map;-pub mod manager;mod migrations;mod notification;pub mod protobuf;pub mod services;+pub mod user_manager;pub mod errors {pub use flowy_error::*;diff --git a/frontend/rust-lib/flowy-user/src/migrations/database_vacuum.rs b/frontend/rust-lib/flowy-user/src/migrations/database_vacuum.rsindex 8c391bec09..34f51c74aa 100644--- a/frontend/rust-lib/flowy-user/src/migrations/database_vacuum.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/database_vacuum.rs@@ -1,5 +1,5 @@use crate::services::db::UserDB;-use crate::services::user_sql::vacuum_database;+use crate::services::sqlite_sql::user_sql::vacuum_database;use flowy_sqlite::kv::StorePreferences;use std::sync::Arc;use tracing::{error, info};diff --git a/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs b/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rsindex 1a2c538dd3..0b68b32eed 100644--- a/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs@@ -9,7 +9,7 @@ use tracing::{event, instrument};use collab_integrate::{CollabKVAction, CollabKVDB, PersistenceError};use flowy_error::{internal_error, FlowyError, FlowyResult};-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::entities::Authenticator;use crate::migrations::migration::UserDataMigration;use crate::migrations::util::load_collab;diff --git a/frontend/rust-lib/flowy-user/src/migrations/migration.rs b/frontend/rust-lib/flowy-user/src/migrations/migration.rsindex fc042f3925..b4af365519 100644--- a/frontend/rust-lib/flowy-user/src/migrations/migration.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/migration.rs@@ -7,7 +7,7 @@ use collab_integrate::CollabKVDB;use flowy_error::FlowyResult;use flowy_sqlite::schema::user_data_migration_records;use flowy_sqlite::ConnectionPool;-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::entities::Authenticator;use crate::services::entities::Session;diff --git a/frontend/rust-lib/flowy-user/src/migrations/mod.rs b/frontend/rust-lib/flowy-user/src/migrations/mod.rsindex 8aa91b65c2..c4b6f884cd 100644--- a/frontend/rust-lib/flowy-user/src/migrations/mod.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/mod.rs@@ -1,4 +1,4 @@-use flowy_user_deps::entities::UserProfile;+use flowy_user_pub::entities::UserProfile;use crate::services::entities::Session;diff --git a/frontend/rust-lib/flowy-user/src/migrations/workspace_and_favorite_v1.rs b/frontend/rust-lib/flowy-user/src/migrations/workspace_and_favorite_v1.rsindex 2e065d117f..8c8c4273c6 100644--- a/frontend/rust-lib/flowy-user/src/migrations/workspace_and_favorite_v1.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/workspace_and_favorite_v1.rs@@ -5,7 +5,7 @@ use tracing::instrument;use collab_integrate::{CollabKVAction, CollabKVDB};use flowy_error::{internal_error, FlowyResult};-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::entities::Authenticator;use crate::migrations::migration::UserDataMigration;use crate::migrations::util::load_collab;diff --git a/frontend/rust-lib/flowy-user/src/migrations/workspace_trash_v1.rs b/frontend/rust-lib/flowy-user/src/migrations/workspace_trash_v1.rsindex 18d06127cd..ff7563c1fe 100644--- a/frontend/rust-lib/flowy-user/src/migrations/workspace_trash_v1.rs+++ b/frontend/rust-lib/flowy-user/src/migrations/workspace_trash_v1.rs@@ -5,7 +5,7 @@ use tracing::instrument;use collab_integrate::{CollabKVAction, CollabKVDB};use flowy_error::{internal_error, FlowyResult};-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::entities::Authenticator;use crate::migrations::migration::UserDataMigration;use crate::migrations::util::load_collab;diff --git a/frontend/rust-lib/flowy-user/src/services/cloud_config.rs b/frontend/rust-lib/flowy-user/src/services/cloud_config.rsindex 5c23beeeb6..6772ac7ab5 100644--- a/frontend/rust-lib/flowy-user/src/services/cloud_config.rs+++ b/frontend/rust-lib/flowy-user/src/services/cloud_config.rs@@ -3,7 +3,7 @@ use std::sync::Arc;use flowy_encrypt::generate_encryption_secret;use flowy_error::FlowyResult;use flowy_sqlite::kv::StorePreferences;-use flowy_user_deps::cloud::UserCloudConfig;+use flowy_user_pub::cloud::UserCloudConfig;const CLOUD_CONFIG_KEY: &str = "af_user_cloud_config";diff --git a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rsindex 977cf0764f..318bce0ffe 100644--- a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs+++ b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs@@ -1,10 +1,10 @@-use crate::manager::run_collab_data_migration;use crate::migrations::session_migration::migrate_session_with_user_uuid;use crate::services::data_import::importer::load_collab_by_oid;use crate::services::db::UserDBPath;use crate::services::entities::{Session, UserPaths};-use crate::services::user_awareness::awareness_oid_from_user_uuid;-use crate::services::user_sql::select_user_profile;+use crate::services::sqlite_sql::user_sql::select_user_profile;+use crate::user_manager::manager_user_awareness::awareness_oid_from_user_uuid;+use crate::user_manager::run_collab_data_migration;use anyhow::anyhow;use collab::core::collab::{CollabDocState, MutexCollab};use collab::core::origin::CollabOrigin;@@ -21,12 +21,12 @@ use collab_entity::CollabType;use collab_folder::{Folder, UserId, View, ViewIdentifier, ViewLayout};use collab_integrate::{CollabKVAction, CollabKVDB, PersistenceError};use flowy_error::{internal_error, FlowyError};-use flowy_folder_deps::cloud::gen_view_id;-use flowy_folder_deps::entities::ImportData;-use flowy_folder_deps::folder_builder::{ParentChildViews, ViewBuilder};+use flowy_folder_pub::cloud::gen_view_id;+use flowy_folder_pub::entities::ImportData;+use flowy_folder_pub::folder_builder::{ParentChildViews, ViewBuilder};use flowy_sqlite::kv::StorePreferences;-use flowy_user_deps::cloud::{UserCloudService, UserCollabParams};-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::cloud::{UserCloudService, UserCollabParams};+use flowy_user_pub::entities::Authenticator;use parking_lot::{Mutex, RwLock};use std::collections::{HashMap, HashSet};use std::ops::{Deref, DerefMut};diff --git a/frontend/rust-lib/flowy-user/src/services/data_import/importer.rs b/frontend/rust-lib/flowy-user/src/services/data_import/importer.rsindex fb368d7d7e..d566483492 100644--- a/frontend/rust-lib/flowy-user/src/services/data_import/importer.rs+++ b/frontend/rust-lib/flowy-user/src/services/data_import/importer.rs@@ -5,7 +5,7 @@ use std::collections::HashMap;use crate::services::data_import::ImportContext;use collab::preclude::Collab;-use flowy_folder_deps::entities::ImportData;+use flowy_folder_pub::entities::ImportData;use std::sync::Arc;use tracing::instrument;diff --git a/frontend/rust-lib/flowy-user/src/services/db.rs b/frontend/rust-lib/flowy-user/src/services/db.rsindex 4ba98a414f..a041a8d927 100644--- a/frontend/rust-lib/flowy-user/src/services/db.rs+++ b/frontend/rust-lib/flowy-user/src/services/db.rs@@ -14,12 +14,12 @@ use flowy_sqlite::{schema::{user_table, user_table::dsl},DBConnection, Database, ExpressionMethods,};-use flowy_user_deps::entities::{UserProfile, UserWorkspace};+use flowy_user_pub::entities::{UserProfile, UserWorkspace};use lib_dispatch::prelude::af_spawn;use lib_infra::file_util::{unzip_and_replace, zip_folder};-use crate::services::user_sql::UserTable;-use crate::services::workspace_sql::UserWorkspaceTable;+use crate::services::sqlite_sql::user_sql::UserTable;+use crate::services::sqlite_sql::workspace_sql::UserWorkspaceTable;pub trait UserDBPath: Send + Sync + 'static {fn sqlite_db_path(&self, uid: i64) -> PathBuf;diff --git a/frontend/rust-lib/flowy-user/src/services/entities.rs b/frontend/rust-lib/flowy-user/src/services/entities.rsindex cc8c2d39d4..2dc35d799a 100644--- a/frontend/rust-lib/flowy-user/src/services/entities.rs+++ b/frontend/rust-lib/flowy-user/src/services/entities.rs@@ -11,11 +11,11 @@ use serde::{Deserialize, Serialize};use serde_json::Value;use uuid::Uuid;-use flowy_user_deps::entities::{AuthResponse, UserProfile, UserWorkspace};-use flowy_user_deps::entities::{Authenticator, UserAuthResponse};+use flowy_user_pub::entities::UserWorkspace;+use flowy_user_pub::entities::{Authenticator, UserAuthResponse};use crate::entities::AuthenticatorPB;-use crate::migrations::MigrationUser;+use crate::services::db::UserDBPath;#[derive(Debug, Clone, Serialize)]@@ -138,14 +138,6 @@ impl From<Authenticator> for AuthenticatorPB {}}-#[derive(Clone)]-pub(crate) struct ResumableSignUp {- pub user_profile: UserProfile,- pub response: AuthResponse,- pub authenticator: Authenticator,- pub migration_user: Option<MigrationUser>,-}-pub const URL_SAFE_ENGINE: GeneralPurpose = GeneralPurpose::new(&URL_SAFE, PAD);pub struct UserConfig {/// Used to store the user datadiff --git a/frontend/rust-lib/flowy-user/src/services/mod.rs b/frontend/rust-lib/flowy-user/src/services/mod.rsindex c212cfb410..9ea5e3fe51 100644--- a/frontend/rust-lib/flowy-user/src/services/mod.rs+++ b/frontend/rust-lib/flowy-user/src/services/mod.rs@@ -3,9 +3,4 @@ pub mod collab_interact;pub mod data_import;pub mod db;pub mod entities;-pub(crate) mod historical_user;-pub(crate) mod user_awareness;-pub(crate) mod user_encryption;-pub(crate) mod user_sql;-pub(crate) mod user_workspace;-pub(crate) mod workspace_sql;+pub mod sqlite_sql;diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rsnew file mode 100644index 0000000000..b3ef842a91--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs@@ -0,0 +1,2 @@+pub(crate) mod user_sql;+pub(crate) mod workspace_sql;diff --git a/frontend/rust-lib/flowy-user/src/services/user_sql.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rssimilarity index 98%rename from frontend/rust-lib/flowy-user/src/services/user_sql.rsrename to frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rsindex 5c004cd0ae..71d3fd50b1 100644--- a/frontend/rust-lib/flowy-user/src/services/user_sql.rs+++ b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs@@ -2,8 +2,8 @@ use diesel::{sql_query, RunQueryDsl};use flowy_error::{internal_error, FlowyError};use std::str::FromStr;-use flowy_user_deps::cloud::UserUpdate;-use flowy_user_deps::entities::*;+use flowy_user_pub::cloud::UserUpdate;+use flowy_user_pub::entities::*;use flowy_sqlite::schema::user_table;diff --git a/frontend/rust-lib/flowy-user/src/services/workspace_sql.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rssimilarity index 96%rename from frontend/rust-lib/flowy-user/src/services/workspace_sql.rsrename to frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rsindex 7ad8f965c3..6dca2f849f 100644--- a/frontend/rust-lib/flowy-user/src/services/workspace_sql.rs+++ b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rs@@ -4,7 +4,7 @@ use chrono::{TimeZone, Utc};use flowy_error::FlowyError;use flowy_sqlite::schema::user_workspace_table;-use flowy_user_deps::entities::UserWorkspace;+use flowy_user_pub::entities::UserWorkspace;#[derive(Clone, Default, Queryable, Identifiable, Insertable)]#[diesel(table_name = user_workspace_table)]diff --git a/frontend/rust-lib/flowy-user/src/manager.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager.rssimilarity index 96%rename from frontend/rust-lib/flowy-user/src/manager.rsrename to frontend/rust-lib/flowy-user/src/user_manager/manager.rsindex a185a3f6bd..f0f3301078 100644--- a/frontend/rust-lib/flowy-user/src/manager.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager.rs@@ -11,14 +11,14 @@ use tracing::{debug, error, event, info, instrument};use collab_integrate::collab_builder::AppFlowyCollabBuilder;use collab_integrate::CollabKVDB;use flowy_error::{internal_error, ErrorCode, FlowyResult};-use flowy_folder_deps::entities::ImportData;-use flowy_server_config::AuthenticatorType;+use flowy_folder_pub::entities::ImportData;+use flowy_server_pub::AuthenticatorType;use flowy_sqlite::kv::StorePreferences;use flowy_sqlite::schema::user_table;use flowy_sqlite::ConnectionPool;use flowy_sqlite::{query_dsl::*, DBConnection, ExpressionMethods};-use flowy_user_deps::cloud::{UserCloudServiceProvider, UserUpdate};-use flowy_user_deps::entities::*;+use flowy_user_pub::cloud::{UserCloudServiceProvider, UserUpdate};+use flowy_user_pub::entities::*;use lib_dispatch::prelude::af_spawn;use lib_infra::box_any::BoxAny;@@ -42,11 +42,12 @@ use crate::services::data_import::{get_appflowy_data_folder_import_context, upload_imported_data, ImportContext,};use crate::services::db::UserDB;-use crate::services::entities::{ResumableSignUp, Session, UserConfig, UserPaths};-use crate::services::user_awareness::UserAwarenessDataSource;-use crate::services::user_encryption::validate_encryption_sign;-use crate::services::user_sql::{select_user_profile, UserTable, UserTableChangeset};-use crate::services::user_workspace::save_user_workspaces;+use crate::services::entities::{Session, UserConfig, UserPaths};+use crate::services::sqlite_sql::user_sql::{select_user_profile, UserTable, UserTableChangeset};+use crate::user_manager::manager_user_awareness::UserAwarenessDataSource;+use crate::user_manager::manager_user_encryption::validate_encryption_sign;+use crate::user_manager::manager_user_workspace::save_user_workspaces;+use crate::user_manager::user_login_state::UserAuthProcess;use crate::{errors::FlowyError, notification::*};pub struct UserManager {@@ -59,7 +60,7 @@ pub struct UserManager {pub(crate) user_status_callback: RwLock<Arc<dyn UserStatusCallback>>,pub(crate) collab_builder: Weak<AppFlowyCollabBuilder>,pub(crate) collab_interact: RwLock<Arc<dyn CollabInteract>>,- resumable_sign_up: Mutex<Option<ResumableSignUp>>,+ auth_process: Mutex<Option<UserAuthProcess>>,current_session: Arc<parking_lot::RwLock<Option<Session>>>,refresh_user_profile_since: AtomicI64,}@@ -91,7 +92,7 @@ impl UserManager {user_status_callback,collab_builder,collab_interact: RwLock::new(Arc::new(DefaultCollabInteract)),- resumable_sign_up: Default::default(),+ auth_process: Default::default(),current_session,refresh_user_profile_since,});@@ -334,16 +335,12 @@ impl UserManager {let response: AuthResponse = auth_service.sign_up(params).await?;let new_user_profile = UserProfile::from((&response, &authenticator));if new_user_profile.encryption_type.require_encrypt_secret() {- self- .resumable_sign_up- .lock()- .await- .replace(ResumableSignUp {- user_profile: new_user_profile.clone(),- migration_user,- response,- authenticator,- });+ self.auth_process.lock().await.replace(UserAuthProcess {+ user_profile: new_user_profile.clone(),+ migration_user,+ response,+ authenticator,+ });} else {self.continue_sign_up(&new_user_profile, migration_user, response, &authenticator)@@ -354,13 +351,13 @@ impl UserManager {#[tracing::instrument(level = "info", skip(self))]pub async fn resume_sign_up(&self) -> Result<(), FlowyError> {- let ResumableSignUp {+ let UserAuthProcess {user_profile,migration_user,response,authenticator,} = self- .resumable_sign_up+ .auth_process.lock().await.clone()diff --git a/frontend/rust-lib/flowy-user/src/services/historical_user.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rssimilarity index 96%rename from frontend/rust-lib/flowy-user/src/services/historical_user.rsrename to frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rsindex 5ca1072b36..0d94e89d3e 100644--- a/frontend/rust-lib/flowy-user/src/services/historical_user.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rs@@ -1,10 +1,10 @@use tracing::instrument;use crate::entities::UserProfilePB;+use crate::user_manager::UserManager;use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_user_deps::entities::Authenticator;+use flowy_user_pub::entities::Authenticator;-use crate::manager::UserManager;use crate::migrations::MigrationUser;use crate::services::entities::Session;diff --git a/frontend/rust-lib/flowy-user/src/services/user_awareness.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rssimilarity index 99%rename from frontend/rust-lib/flowy-user/src/services/user_awareness.rsrename to frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rsindex d6819deee5..eaa3c1dd67 100644--- a/frontend/rust-lib/flowy-user/src/services/user_awareness.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rs@@ -13,8 +13,8 @@ use collab_integrate::CollabKVDB;use flowy_error::{ErrorCode, FlowyError, FlowyResult};use crate::entities::ReminderPB;-use crate::manager::UserManager;use crate::services::entities::Session;+use crate::user_manager::UserManager;impl UserManager {/// Adds a new reminder based on the given payload.diff --git a/frontend/rust-lib/flowy-user/src/services/user_encryption.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rssimilarity index 97%rename from frontend/rust-lib/flowy-user/src/services/user_encryption.rsrename to frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rsindex b323e45ad1..4288260899 100644--- a/frontend/rust-lib/flowy-user/src/services/user_encryption.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rs@@ -1,11 +1,11 @@use crate::entities::{AuthStateChangedPB, AuthStatePB};+use crate::user_manager::UserManager;use flowy_encrypt::{decrypt_text, encrypt_text};use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_user_deps::entities::{+use flowy_user_pub::entities::{EncryptionType, UpdateUserProfileParams, UserCredentials, UserProfile,};-use crate::manager::UserManager;use crate::notification::send_auth_state_notification;use crate::services::cloud_config::get_encrypt_secret;diff --git a/frontend/rust-lib/flowy-user/src/services/user_workspace.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rssimilarity index 96%rename from frontend/rust-lib/flowy-user/src/services/user_workspace.rsrename to frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rsindex 6c72aefec8..02589c39cc 100644--- a/frontend/rust-lib/flowy-user/src/services/user_workspace.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs@@ -7,13 +7,13 @@ use tracing::{error, instrument};use flowy_error::{FlowyError, FlowyResult};use flowy_sqlite::schema::user_workspace_table;use flowy_sqlite::{query_dsl::*, ConnectionPool, ExpressionMethods};-use flowy_user_deps::entities::{Role, UserWorkspace, WorkspaceMember};+use flowy_user_pub::entities::{Role, UserWorkspace, WorkspaceMember};use lib_dispatch::prelude::af_spawn;use crate::entities::{RepeatedUserWorkspacePB, ResetWorkspacePB};-use crate::manager::UserManager;use crate::notification::{send_notification, UserNotification};-use crate::services::workspace_sql::UserWorkspaceTable;+use crate::services::sqlite_sql::workspace_sql::UserWorkspaceTable;+use crate::user_manager::UserManager;impl UserManager {#[instrument(skip(self), err)]diff --git a/frontend/rust-lib/flowy-user/src/user_manager/mod.rs b/frontend/rust-lib/flowy-user/src/user_manager/mod.rsnew file mode 100644index 0000000000..3ce66227c5--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/user_manager/mod.rs@@ -0,0 +1,8 @@+mod manager;+pub(crate) mod manager_history_user;+pub(crate) mod manager_user_awareness;+pub(crate) mod manager_user_encryption;+pub(crate) mod manager_user_workspace;+mod user_login_state;++pub use manager::*;diff --git a/frontend/rust-lib/flowy-user/src/user_manager/user_login_state.rs b/frontend/rust-lib/flowy-user/src/user_manager/user_login_state.rsnew file mode 100644index 0000000000..ef8e51be12--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/user_manager/user_login_state.rs@@ -0,0 +1,11 @@+use crate::migrations::MigrationUser;+use flowy_user_pub::entities::{AuthResponse, Authenticator, UserProfile};++/// recording the intermediate state of the sign-in/sign-up process+#[derive(Clone)]+pub struct UserAuthProcess {+ pub user_profile: UserProfile,+ pub response: AuthResponse,+ pub authenticator: Authenticator,+ pub migration_user: Option<MigrationUser>,+}diff --git a/frontend/rust-lib/lib-infra/Cargo.toml b/frontend/rust-lib/lib-infra/Cargo.tomlindex 4586b2be97..30e8390976 100644--- a/frontend/rust-lib/lib-infra/Cargo.toml+++ b/frontend/rust-lib/lib-infra/Cargo.toml@@ -19,6 +19,12 @@ anyhow.workspace = truewalkdir = "2.4.0"tempfile = "3.8.1"validator = "0.16.0"+tracing.workspace = true+atomic_refcell = "0.1"++[dev-dependencies]+rand = "0.8.5"+futures = "0.3.30"[target.'cfg(not(target_arch = "wasm32"))'.dependencies]zip = { version = "0.6.6", features = ["deflate"] }diff --git a/frontend/rust-lib/lib-infra/src/lib.rs b/frontend/rust-lib/lib-infra/src/lib.rsindex 1789e97b2a..2d7ac5d091 100644--- a/frontend/rust-lib/lib-infra/src/lib.rs+++ b/frontend/rust-lib/lib-infra/src/lib.rs@@ -11,3 +11,5 @@ pub mod future;pub mod ref_map;pub mod util;pub mod validator_fn;++pub mod priority_task;diff --git a/frontend/rust-lib/flowy-task/src/lib.rs b/frontend/rust-lib/lib-infra/src/priority_task/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-task/src/lib.rsrename to frontend/rust-lib/lib-infra/src/priority_task/mod.rsdiff --git a/frontend/rust-lib/flowy-task/src/queue.rs b/frontend/rust-lib/lib-infra/src/priority_task/queue.rssimilarity index 98%rename from frontend/rust-lib/flowy-task/src/queue.rsrename to frontend/rust-lib/lib-infra/src/priority_task/queue.rsindex 5ec47dde79..2123ef15ca 100644--- a/frontend/rust-lib/flowy-task/src/queue.rs+++ b/frontend/rust-lib/lib-infra/src/priority_task/queue.rs@@ -1,4 +1,4 @@-use crate::{PendingTask, Task};+use crate::priority_task::{PendingTask, Task};use atomic_refcell::AtomicRefCell;use std::cmp::Ordering;use std::collections::hash_map::Entry;diff --git a/frontend/rust-lib/flowy-task/src/scheduler.rs b/frontend/rust-lib/lib-infra/src/priority_task/scheduler.rssimilarity index 96%rename from frontend/rust-lib/flowy-task/src/scheduler.rsrename to frontend/rust-lib/lib-infra/src/priority_task/scheduler.rsindex c7e5409472..1e1bb33c2d 100644--- a/frontend/rust-lib/flowy-task/src/scheduler.rs+++ b/frontend/rust-lib/lib-infra/src/priority_task/scheduler.rs@@ -2,16 +2,14 @@ use std::collections::HashMap;use std::sync::Arc;use std::time::Duration;+use crate::future::BoxResultFuture;+use crate::priority_task::queue::TaskQueue;+use crate::priority_task::store::TaskStore;+use crate::priority_task::{Task, TaskContent, TaskId, TaskState};use anyhow::Error;use tokio::sync::{watch, RwLock};use tokio::time::interval;-use lib_infra::future::BoxResultFuture;--use crate::queue::TaskQueue;-use crate::store::TaskStore;-use crate::{Task, TaskContent, TaskId, TaskState};-pub struct TaskDispatcher {queue: TaskQueue,store: TaskStore,diff --git a/frontend/rust-lib/flowy-task/src/store.rs b/frontend/rust-lib/lib-infra/src/priority_task/store.rssimilarity index 95%rename from frontend/rust-lib/flowy-task/src/store.rsrename to frontend/rust-lib/lib-infra/src/priority_task/store.rsindex 287b91b0db..b9b2c8599e 100644--- a/frontend/rust-lib/flowy-task/src/store.rs+++ b/frontend/rust-lib/lib-infra/src/priority_task/store.rs@@ -1,4 +1,4 @@-use crate::{Task, TaskId, TaskState};+use crate::priority_task::{Task, TaskId, TaskState};use std::collections::HashMap;use std::mem;use std::sync::atomic::AtomicU32;diff --git a/frontend/rust-lib/flowy-task/src/task.rs b/frontend/rust-lib/lib-infra/src/priority_task/task.rssimilarity index 98%rename from frontend/rust-lib/flowy-task/src/task.rsrename to frontend/rust-lib/lib-infra/src/priority_task/task.rsindex 68c2ae2425..e10f55d892 100644--- a/frontend/rust-lib/flowy-task/src/task.rs+++ b/frontend/rust-lib/lib-infra/src/priority_task/task.rs@@ -1,4 +1,4 @@-use crate::TaskHandlerId;+use crate::priority_task::TaskHandlerId;use std::cmp::Ordering;use tokio::sync::oneshot::{Receiver, Sender};diff --git a/frontend/rust-lib/flowy-task/tests/main.rs b/frontend/rust-lib/lib-infra/tests/main.rssimilarity index 100%rename from frontend/rust-lib/flowy-task/tests/main.rsrename to frontend/rust-lib/lib-infra/tests/main.rsdiff --git a/frontend/rust-lib/flowy-task/tests/task_test/mod.rs b/frontend/rust-lib/lib-infra/tests/task_test/mod.rssimilarity index 100%rename from frontend/rust-lib/flowy-task/tests/task_test/mod.rsrename to frontend/rust-lib/lib-infra/tests/task_test/mod.rsdiff --git a/frontend/rust-lib/flowy-task/tests/task_test/script.rs b/frontend/rust-lib/lib-infra/tests/task_test/script.rssimilarity index 99%rename from frontend/rust-lib/flowy-task/tests/task_test/script.rsrename to frontend/rust-lib/lib-infra/tests/task_test/script.rsindex 58c315daf1..c419d981f2 100644--- a/frontend/rust-lib/flowy-task/tests/task_test/script.rs+++ b/frontend/rust-lib/lib-infra/tests/task_test/script.rs@@ -1,11 +1,11 @@use anyhow::Error;-use flowy_task::{- Task, TaskContent, TaskDispatcher, TaskHandler, TaskId, TaskResult, TaskRunner, TaskState,-};use futures::stream::FuturesUnordered;use futures::StreamExt;use lib_infra::async_trait::async_trait;use lib_infra::future::BoxResultFuture;+use lib_infra::priority_task::{+ Task, TaskContent, TaskDispatcher, TaskHandler, TaskId, TaskResult, TaskRunner, TaskState,+};use lib_infra::ref_map::RefCountValue;use rand::Rng;use std::sync::Arc;diff --git a/frontend/rust-lib/flowy-task/tests/task_test/task_cancel_test.rs b/frontend/rust-lib/lib-infra/tests/task_test/task_cancel_test.rssimilarity index 96%rename from frontend/rust-lib/flowy-task/tests/task_test/task_cancel_test.rsrename to frontend/rust-lib/lib-infra/tests/task_test/task_cancel_test.rsindex a86eb38949..3f1be7c66a 100644--- a/frontend/rust-lib/flowy-task/tests/task_test/task_cancel_test.rs+++ b/frontend/rust-lib/lib-infra/tests/task_test/task_cancel_test.rs@@ -1,6 +1,6 @@use crate::task_test::script::SearchScript::*;use crate::task_test::script::{make_text_background_task, make_timeout_task, SearchTest};-use flowy_task::{QualityOfService, Task, TaskContent, TaskState};+use lib_infra::priority_task::{QualityOfService, Task, TaskContent, TaskState};#[tokio::test]async fn task_cancel_background_task_test() {diff --git a/frontend/rust-lib/flowy-task/tests/task_test/task_order_test.rs b/frontend/rust-lib/lib-infra/tests/task_test/task_order_test.rssimilarity index 100%rename from frontend/rust-lib/flowy-task/tests/task_test/task_order_test.rsrename to frontend/rust-lib/lib-infra/tests/task_test/task_order_test.rs