Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: deps crates (#4362)

Browse Source 
* refactor: rename flowy-folder-deps to flowy-folder-pub

* chore: rename crates

* chore: move flowy-task to lib-infra

* chore: rename crates

* refactor: user manager dir
This commit is contained in:
Nathan.fooo 2024-01-11 14:42:03 +08:00 committed by GitHub
parent dd8b9dd43e
commit 307556b7dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
133 changed files with 362 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
frontend/appflowy_tauri/src-tauri/Cargo.lock generated
View File

@ -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"

109
frontend/rust-lib/Cargo.lock generated
View File

@ -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",

22
frontend/rust-lib/Cargo.toml
View File

@ -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" }

2
frontend/rust-lib/dart-ffi/Cargo.toml
View File

@ -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 = true
serde_yaml = "0.9.27"

2
frontend/rust-lib/dart-ffi/src/appflowy_yaml.rs
View File

@ -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 {

6
frontend/rust-lib/dart-ffi/src/env_serde.rs
View File

@ -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 {

2
frontend/rust-lib/dart-ffi/src/lib.rs
View File

@ -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::*;

10
frontend/rust-lib/event-integration/Cargo.toml
View File

@ -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 = true
flowy-storage = { workspace = true }

4
frontend/rust-lib/event-integration/src/user_event.rs
View File

@ -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,

10
frontend/rust-lib/event-integration/tests/util.rs
View File

@ -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()?;

11
frontend/rust-lib/flowy-core/Cargo.toml
View File

@ -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 }

4
frontend/rust-lib/flowy-core/src/config.rs
View File

@ -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;

2
frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs
View File

@ -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;

6
frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs
View File

@ -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();

4
frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs
View File

@ -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 {

6
frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs
View File

@ -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;

2
frontend/rust-lib/flowy-core/src/integrate/collab_interact.rs
View File

@ -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;

1
frontend/rust-lib/flowy-core/src/integrate/log.rs
View File

@ -32,7 +32,6 @@ pub(crate) fn create_log_filter(level: String, with_crates: Vec<String>) -> Stri
filters.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"));

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

@ -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;

14
frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs
View File

@ -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};

4
frontend/rust-lib/flowy-core/src/integrate/user.rs
View File

@ -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};

6
frontend/rust-lib/flowy-core/src/lib.rs
View File

@ -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;

2
frontend/rust-lib/flowy-core/src/module.rs
View File

@ -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(

2
frontend/rust-lib/flowy-database-deps/Cargo.toml → frontend/rust-lib/flowy-database-pub/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "flowy-database-deps"
name = "flowy-database-pub"
version = "0.1.0"
edition = "2021"

0
frontend/rust-lib/flowy-database-deps/src/cloud.rs → frontend/rust-lib/flowy-database-pub/src/cloud.rs
View File

0
frontend/rust-lib/flowy-database-deps/src/lib.rs → frontend/rust-lib/flowy-database-pub/src/lib.rs
View File

3
frontend/rust-lib/flowy-database2/Cargo.toml
View File

@ -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 = true
flowy-notification = { workspace = true }
@ -19,7 +19,6 @@ protobuf.workspace = true
flowy-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 = true
tracing.workspace = true
serde.workspace = true

4
frontend/rust-lib/flowy-database2/src/manager.rs
View File

@ -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,

2
frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs
View File

@ -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};

2
frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs
View File

@ -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;

2
frontend/rust-lib/flowy-database2/src/services/filter/controller.rs
View File

@ -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};

2
frontend/rust-lib/flowy-database2/src/services/filter/task.rs
View File

@ -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;

2
frontend/rust-lib/flowy-database2/src/services/sort/controller.rs
View File

@ -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;

2
frontend/rust-lib/flowy-database2/src/services/sort/task.rs
View File

@ -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;

2
frontend/rust-lib/flowy-document-deps/Cargo.toml → frontend/rust-lib/flowy-document-pub/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "flowy-document-deps"
name = "flowy-document-pub"
version = "0.1.0"
edition = "2021"

0
frontend/rust-lib/flowy-document-deps/src/cloud.rs → frontend/rust-lib/flowy-document-pub/src/cloud.rs
View File

0
frontend/rust-lib/flowy-document-deps/src/lib.rs → frontend/rust-lib/flowy-document-pub/src/lib.rs
View File

2
frontend/rust-lib/flowy-document/Cargo.toml
View File

@ -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 = true
flowy-notification = { workspace = true }

2
frontend/rust-lib/flowy-document/src/manager.rs
View File

@ -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;

2
frontend/rust-lib/flowy-document/tests/document/util.rs
View File

@ -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;

2
frontend/rust-lib/flowy-folder-deps/Cargo.toml → frontend/rust-lib/flowy-folder-pub/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "flowy-folder-deps"
name = "flowy-folder-pub"
version = "0.1.0"
edition = "2021"

0
frontend/rust-lib/flowy-folder-deps/src/cloud.rs → frontend/rust-lib/flowy-folder-pub/src/cloud.rs
View File

0
frontend/rust-lib/flowy-folder-deps/src/entities.rs → frontend/rust-lib/flowy-folder-pub/src/entities.rs
View File

0
frontend/rust-lib/flowy-folder-deps/src/folder_builder.rs → frontend/rust-lib/flowy-folder-pub/src/folder_builder.rs
View File

0
frontend/rust-lib/flowy-folder-deps/src/lib.rs → frontend/rust-lib/flowy-folder-pub/src/lib.rs
View File

2
frontend/rust-lib/flowy-folder/Cargo.toml
View File

@ -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 = true
flowy-notification = { workspace = true }

2
frontend/rust-lib/flowy-folder/src/entities/view.rs
View File

@ -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};

4
frontend/rust-lib/flowy-folder/src/manager.rs
View File

@ -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;

2
frontend/rust-lib/flowy-folder/src/test_helper.rs
View File

@ -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;

2
frontend/rust-lib/flowy-folder/src/user_default.rs
View File

@ -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;

2
frontend/rust-lib/flowy-folder/src/util.rs
View File

@ -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;

2
frontend/rust-lib/flowy-folder/src/view_operation.rs
View File

@ -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;

2
frontend/rust-lib/flowy-server-config/Cargo.toml → frontend/rust-lib/flowy-server-pub/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "flowy-server-config"
name = "flowy-server-pub"
version = "0.1.0"
edition = "2021"

0
frontend/rust-lib/flowy-server-config/src/af_cloud_config.rs → frontend/rust-lib/flowy-server-pub/src/af_cloud_config.rs
View File

0
frontend/rust-lib/flowy-server-config/src/lib.rs → frontend/rust-lib/flowy-server-pub/src/lib.rs
View File

0
frontend/rust-lib/flowy-server-config/src/supabase_config.rs → frontend/rust-lib/flowy-server-pub/src/supabase_config.rs
View File

10
frontend/rust-lib/flowy-server/Cargo.toml
View File

@ -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"

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

@ -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;

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs
View File

@ -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;

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs
View File

@ -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,
};

4
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs
View File

@ -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;

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs
View File

@ -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,
};

2
frontend/rust-lib/flowy-server/src/af_cloud/impls/user/util.rs
View File

@ -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 {

12
frontend/rust-lib/flowy-server/src/af_cloud/server.rs
View File

@ -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;

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

@ -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();

2
frontend/rust-lib/flowy-server/src/local_server/impls/document.rs
View File

@ -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;

2
frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs
View File

@ -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,
};

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

@ -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;

10
frontend/rust-lib/flowy-server/src/local_server/server.rs
View File

@ -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,

10
frontend/rust-lib/flowy-server/src/server.rs
View File

@ -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 {

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

@ -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;

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

@ -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;

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

@ -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,
};

2
frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs
View File

@ -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;

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

@ -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;

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

@ -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;

2
frontend/rust-lib/flowy-server/src/supabase/file_storage/core.rs
View File

@ -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;

10
frontend/rust-lib/flowy-server/src/supabase/server.rs
View File

@ -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,

2
frontend/rust-lib/flowy-server/tests/af_cloud_test/user_test.rs
View File

@ -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::{

2
frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs
View File

@ -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;

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

@ -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::{

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

@ -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::{

2
frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs
View File

@ -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::{

8
frontend/rust-lib/flowy-server/tests/supabase_test/util.rs
View File

@ -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;

19
frontend/rust-lib/flowy-task/Cargo.toml
View File

@ -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 = true

2
frontend/rust-lib/flowy-user-deps/Cargo.toml → frontend/rust-lib/flowy-user-pub/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "flowy-user-deps"
name = "flowy-user-pub"
version = "0.1.0"
edition = "2021"

0
frontend/rust-lib/flowy-user-deps/src/cloud.rs → frontend/rust-lib/flowy-user-pub/src/cloud.rs
View File

0
frontend/rust-lib/flowy-user-deps/src/entities.rs → frontend/rust-lib/flowy-user-pub/src/entities.rs
View File

1
frontend/rust-lib/flowy-user-deps/src/lib.rs → frontend/rust-lib/flowy-user-pub/src/lib.rs
View File

@ -1,3 +1,4 @@
pub mod cloud;
pub mod entities;
pub const DEFAULT_USER_NAME: fn() -> String = || "Me".to_string();

6
frontend/rust-lib/flowy-user/Cargo.toml
View File

@ -10,10 +10,10 @@ flowy-derive.workspace = true
flowy-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 = true
tracing.workspace = true
bytes.workspace = true

4
frontend/rust-lib/flowy-user/src/anon_user/migrate_anon_user_collab.rs
View File

@ -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;

2
frontend/rust-lib/flowy-user/src/anon_user/sync_af_user_collab.rs
View File

@ -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;

2
frontend/rust-lib/flowy-user/src/anon_user/sync_supabase_user_collab.rs
View File

@ -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;

2
frontend/rust-lib/flowy-user/src/entities/auth.rs
View File

@ -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;

2
frontend/rust-lib/flowy-user/src/entities/user_profile.rs
View File

@ -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;

2
frontend/rust-lib/flowy-user/src/entities/workspace_member.rs
View File

@ -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)]

6
frontend/rust-lib/flowy-user/src/event_handler.rs
View File

@ -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 = manager

6
frontend/rust-lib/flowy-user/src/event_map.rs
View File

@ -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 {

2
frontend/rust-lib/flowy-user/src/lib.rs
View File

@ -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::*;

2
frontend/rust-lib/flowy-user/src/migrations/database_vacuum.rs
View File

@ -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};

Some files were not shown because too many files have changed in this diff Show More