From 81594fa796fe391b2a2f0ff6d415e3961372a597 Mon Sep 17 00:00:00 2001 From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com> Date: Sun, 7 Apr 2024 15:22:37 +0800 Subject: [PATCH] chore: bump client api (#5078) --- frontend/appflowy_tauri/src-tauri/Cargo.lock | 114 ++--------------- frontend/appflowy_tauri/src-tauri/Cargo.toml | 2 +- frontend/appflowy_web/wasm-libs/Cargo.toml | 2 +- .../appflowy_web_app/src-tauri/Cargo.lock | 121 ++---------------- .../appflowy_web_app/src-tauri/Cargo.toml | 2 +- frontend/rust-lib/Cargo.lock | 108 ++-------------- frontend/rust-lib/Cargo.toml | 2 +- frontend/rust-lib/flowy-core/Cargo.toml | 2 +- frontend/rust-lib/flowy-server/Cargo.toml | 2 +- 9 files changed, 39 insertions(+), 316 deletions(-) diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 86046703db91c..a7662f0469508 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -156,7 +156,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -712,13 +712,14 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", + "brotli", "bytes", "chrono", "client-websocket", @@ -732,7 +733,6 @@ dependencies = [ "getrandom 0.2.10", "gotrue", "gotrue-entity", - "governor", "mime", "parking_lot 0.12.1", "prost", @@ -751,14 +751,13 @@ dependencies = [ "url", "uuid", "wasm-bindgen-futures", - "workspace-template", "yrs", ] [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "futures-channel", "futures-util", @@ -997,7 +996,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -1022,7 +1021,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -1370,7 +1369,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -2351,12 +2350,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - [[package]] name = "futures-util" version = "0.3.30" @@ -2686,7 +2679,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "futures-util", @@ -2703,7 +2696,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -2714,24 +2707,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "governor" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.1", - "quanta", - "rand 0.8.5", - "smallvec", -] - [[package]] name = "gtk" version = "0.15.5" @@ -3143,7 +3118,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "reqwest", @@ -3507,15 +3482,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - [[package]] name = "macroific" version = "1.3.1" @@ -3776,12 +3742,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "nodrop" version = "0.1.14" @@ -3798,12 +3758,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "ntapi" version = "0.4.1" @@ -4747,22 +4701,6 @@ dependencies = [ "psl-types", ] -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quick-xml" version = "0.28.2" @@ -4879,15 +4817,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5588,7 +5517,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -7579,27 +7508,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "workspace-template" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "collab", - "collab-document", - "collab-entity", - "collab-folder", - "getrandom 0.2.10", - "indexmap 2.1.0", - "nanoid", - "serde", - "serde_json", - "tokio", - "uuid", -] - [[package]] name = "wry" version = "0.24.6" diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index fd625df074082..193120e327199 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -87,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b1a6338527e7a4836f77eae3ba00f9b09de223a3" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index 250c7169f39f9..8f2b55894249c 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.toml +++ b/frontend/appflowy_web/wasm-libs/Cargo.toml @@ -55,7 +55,7 @@ codegen-units = 1 # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b1a6338527e7a4836f77eae3ba00f9b09de223a3" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lock index e8b3493652b4c..4cd3d2ddc6ed1 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.lock +++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock @@ -147,7 +147,7 @@ checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -687,13 +687,14 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", + "brotli", "bytes", "chrono", "client-websocket", @@ -707,7 +708,6 @@ dependencies = [ "getrandom 0.2.12", "gotrue", "gotrue-entity", - "governor", "mime", "parking_lot 0.12.1", "prost", @@ -726,14 +726,13 @@ dependencies = [ "url", "uuid", "wasm-bindgen-futures", - "workspace-template", "yrs", ] [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "futures-channel", "futures-util", @@ -981,7 +980,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -1006,7 +1005,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -1358,7 +1357,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -2411,12 +2410,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.30" @@ -2756,7 +2749,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "futures-util", @@ -2773,7 +2766,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -2784,26 +2777,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "governor" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.1", - "portable-atomic", - "quanta", - "rand 0.8.5", - "smallvec", - "spinning_top", -] - [[package]] name = "gtk" version = "0.15.5" @@ -3220,7 +3193,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "reqwest", @@ -3846,12 +3819,6 @@ dependencies = [ "libc", ] -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "nodrop" version = "0.1.14" @@ -3868,12 +3835,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "ntapi" version = "0.4.1" @@ -4545,12 +4506,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - [[package]] name = "postgrest" version = "1.6.0" @@ -4823,21 +4778,6 @@ dependencies = [ "psl-types", ] -[[package]] -name = "quanta" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quick-xml" version = "0.31.0" @@ -4954,15 +4894,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "raw-cpuid" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" -dependencies = [ - "bitflags 2.5.0", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5677,7 +5608,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -5834,15 +5765,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spinning_top" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -dependencies = [ - "lock_api", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -7876,27 +7798,6 @@ dependencies = [ "wayland-protocols-wlr", ] -[[package]] -name = "workspace-template" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "collab", - "collab-document", - "collab-entity", - "collab-folder", - "getrandom 0.2.12", - "indexmap 2.2.6", - "nanoid", - "serde", - "serde_json", - "tokio", - "uuid", -] - [[package]] name = "wry" version = "0.24.7" diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml index fd625df074082..193120e327199 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.toml +++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml @@ -87,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b1a6338527e7a4836f77eae3ba00f9b09de223a3" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 65f4df690837a..f919588c6e72b 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -157,7 +157,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -669,13 +669,14 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", + "brotli", "bytes", "chrono", "client-websocket", @@ -689,7 +690,6 @@ dependencies = [ "getrandom 0.2.10", "gotrue", "gotrue-entity", - "governor", "mime", "parking_lot 0.12.1", "prost", @@ -708,14 +708,13 @@ dependencies = [ "url", "uuid", "wasm-bindgen-futures", - "workspace-template", "yrs", ] [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "futures-channel", "futures-util", @@ -923,7 +922,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -948,7 +947,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "bincode", @@ -1292,7 +1291,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -2481,7 +2480,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "futures-util", @@ -2498,7 +2497,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -2509,24 +2508,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "governor" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.1", - "quanta", - "rand 0.8.5", - "smallvec", -] - [[package]] name = "h2" version = "0.3.21" @@ -2877,7 +2858,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "reqwest", @@ -3120,15 +3101,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - [[package]] name = "macroific" version = "1.3.1" @@ -3337,12 +3309,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "nom" version = "7.1.3" @@ -3353,12 +3319,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "ntapi" version = "0.4.1" @@ -4130,22 +4090,6 @@ dependencies = [ "psl-types", ] -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quickcheck" version = "1.0.3" @@ -4303,15 +4247,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "rayon" version = "1.9.0" @@ -4936,7 +4871,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=b1a6338527e7a4836f77eae3ba00f9b09de223a3#b1a6338527e7a4836f77eae3ba00f9b09de223a3" dependencies = [ "anyhow", "app-error", @@ -6371,27 +6306,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "workspace-template" -version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "collab", - "collab-document", - "collab-entity", - "collab-folder", - "getrandom 0.2.10", - "indexmap 2.1.0", - "nanoid", - "serde", - "serde_json", - "tokio", - "uuid", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 984573d5edfff..23c70d5d0a5b9 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -111,7 +111,7 @@ rocksdb = { git = "https://github.com/LucasXu0/rust-rocksdb", rev = "21cf4a23ec1 # Run the script.add_workspace_members: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b1a6338527e7a4836f77eae3ba00f9b09de223a3" } # Please use the following script to update collab. # Working directory: frontend # diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml index d08670746624f..09e106730a3f0 100644 --- a/frontend/rust-lib/flowy-core/Cargo.toml +++ b/frontend/rust-lib/flowy-core/Cargo.toml @@ -29,7 +29,7 @@ collab = { version = "0.1.0" } diesel.workspace = true uuid.workspace = true flowy-storage = { workspace = true } -client-api = { version = "0.1.0", features = ["collab-sync", "template"] } +client-api = { version = "0.1.0" } tracing.workspace = true futures-core = { version = "0.3", default-features = false } diff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.toml index dfd47a167f259..ce6b7b93569d6 100644 --- a/frontend/rust-lib/flowy-server/Cargo.toml +++ b/frontend/rust-lib/flowy-server/Cargo.toml @@ -55,6 +55,7 @@ version = "0.1.0" features = [ "collab-sync", "test_util", + "enable_brotli", # Uncomment the following line to enable verbose logging for sync # "sync_verbose_log", ] @@ -65,7 +66,6 @@ tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } dotenv = "0.15.0" assert-json-diff = "2.0.2" serde_json.workspace = true -client-api = { version = "0.1.0" } [features] enable_supabase = ["collab-plugins/postgres_plugin"] \ No newline at end of file