diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 22f577a27c..13c12a20f5 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -172,7 +172,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bincode", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "appflowy-ai-client" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bytes", @@ -826,7 +826,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "again", "anyhow", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "client-api-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "collab-entity", "collab-rt-entity", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "futures-channel", "futures-util", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bincode", @@ -1153,7 +1153,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "async-trait", @@ -1417,7 +1417,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1528,7 +1528,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -3029,7 +3029,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "futures-util", @@ -3046,7 +3046,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -3478,7 +3478,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bytes", @@ -6022,7 +6022,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -8300,9 +8300,9 @@ dependencies = [ [[package]] name = "yrs" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71df0198938b69f1eec0d5f19f591c6e4f2f770b0bf16f858428f6d91b8bb280" +checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index 326b7e9ade..d2f66f002c 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -53,7 +53,7 @@ collab-user = { version = "0.2" } # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "f73b603dc4569ea3f23c41901564b90691ac1aaa" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "76a8993cac42ff89acb507cdb99942cac7c9bfd0" } [dependencies] serde_json.workspace = true diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lock index 7823b68ac9..7b24a985b9 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.lock +++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock @@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bincode", @@ -183,7 +183,7 @@ dependencies = [ [[package]] name = "appflowy-ai-client" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bytes", @@ -800,7 +800,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "again", "anyhow", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "client-api-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "collab-entity", "collab-rt-entity", @@ -862,7 +862,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "futures-channel", "futures-util", @@ -1111,7 +1111,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bincode", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "async-trait", @@ -1407,7 +1407,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.10", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1518,7 +1518,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -3095,7 +3095,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "futures-util", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bytes", @@ -6085,7 +6085,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -8557,9 +8557,9 @@ dependencies = [ [[package]] name = "yrs" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71df0198938b69f1eec0d5f19f591c6e4f2f770b0bf16f858428f6d91b8bb280" +checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml index 88201436b6..4c3dbac913 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.toml +++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml @@ -52,7 +52,7 @@ collab-user = { version = "0.2" } # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "f73b603dc4569ea3f23c41901564b90691ac1aaa" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "76a8993cac42ff89acb507cdb99942cac7c9bfd0" } [dependencies] serde_json.workspace = true diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 44c3167eee..15c5c67ad5 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bincode", @@ -183,7 +183,7 @@ dependencies = [ [[package]] name = "appflowy-ai-client" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bytes", @@ -718,7 +718,7 @@ dependencies = [ [[package]] name = "client-api" version = "0.2.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "again", "anyhow", @@ -768,7 +768,7 @@ dependencies = [ [[package]] name = "client-api-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "collab-entity", "collab-rt-entity", @@ -780,7 +780,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "futures-channel", "futures-util", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bincode", @@ -1014,7 +1014,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "async-trait", @@ -1352,7 +1352,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -2696,7 +2696,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "futures-util", @@ -2713,7 +2713,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -3078,7 +3078,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "bytes", @@ -5224,7 +5224,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=f73b603dc4569ea3f23c41901564b90691ac1aaa#f73b603dc4569ea3f23c41901564b90691ac1aaa" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=76a8993cac42ff89acb507cdb99942cac7c9bfd0#76a8993cac42ff89acb507cdb99942cac7c9bfd0" dependencies = [ "anyhow", "app-error", @@ -6878,9 +6878,9 @@ dependencies = [ [[package]] name = "yrs" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71df0198938b69f1eec0d5f19f591c6e4f2f770b0bf16f858428f6d91b8bb280" +checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index ff9f2177cf..e8ad15b712 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -99,11 +99,11 @@ zip = "2.1.3" # 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 = "f73b603dc4569ea3f23c41901564b90691ac1aaa" } -client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "f73b603dc4569ea3f23c41901564b90691ac1aaa" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "76a8993cac42ff89acb507cdb99942cac7c9bfd0" } +client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "76a8993cac42ff89acb507cdb99942cac7c9bfd0" } [profile.dev] -opt-level = 1 +opt-level = 0 lto = false codegen-units = 16 debug = true @@ -119,12 +119,8 @@ debug = true codegen-units = 16 lto = false -## debuginfo — it makes ./target much bigger, which again harms caching. Depending on your preferred workflow, -## you might consider disabling debuginfo unconditionally, this brings some benefits for local builds as well. #strip = "debuginfo" -## For from-scratch builds, incremental adds an extra dependency-tracking overhead. It also significantly increases -## the amount of IO and the size of ./target, which make caching less effective. -incremental = false +incremental = true [patch.crates-io] # TODO(Lucas.Xu) Upgrade to the latest version of RocksDB once PR(https://github.com/rust-rocksdb/rust-rocksdb/pull/869) is merged. diff --git a/frontend/rust-lib/event-integration-test/src/user_event.rs b/frontend/rust-lib/event-integration-test/src/user_event.rs index 40e8044806..54e3673d34 100644 --- a/frontend/rust-lib/event-integration-test/src/user_event.rs +++ b/frontend/rust-lib/event-integration-test/src/user_event.rs @@ -87,7 +87,18 @@ impl EventIntegrationTest { pub async fn af_cloud_sign_up(&self) -> UserProfilePB { let email = unique_email(); - self.af_cloud_sign_in_with_email(&email).await.unwrap() + match self.af_cloud_sign_in_with_email(&email).await { + Ok(profile) => profile, + Err(err) => { + tracing::warn!( + "Failed to sign up with email: {}, error: {}, retrying", + email, + err + ); + tokio::time::sleep(tokio::time::Duration::from_secs(1)).await; + self.af_cloud_sign_in_with_email(&email).await.unwrap() + }, + } } pub async fn supabase_party_sign_up(&self) -> UserProfilePB { diff --git a/frontend/rust-lib/flowy-chat/src/local_ai/local_llm_chat.rs b/frontend/rust-lib/flowy-chat/src/local_ai/local_llm_chat.rs index c7aac0b090..6c0d089c40 100644 --- a/frontend/rust-lib/flowy-chat/src/local_ai/local_llm_chat.rs +++ b/frontend/rust-lib/flowy-chat/src/local_ai/local_llm_chat.rs @@ -182,6 +182,10 @@ impl LocalAIController { } pub fn open_chat(&self, chat_id: &str) { + if !self.is_chat_enabled() { + return; + } + if !self.is_running() { return; } @@ -320,10 +324,8 @@ impl LocalAIController { error!("[AI Plugin] failed to initialize local ai: {:?}", err); } let _ = rx.await; - } else { - if let Err(err) = self.llm_chat.destroy_chat_plugin().await { - error!("[AI Plugin] failed to destroy plugin: {:?}", err); - } + } else if let Err(err) = self.llm_chat.destroy_chat_plugin().await { + error!("[AI Plugin] failed to destroy plugin: {:?}", err); } Ok(()) } 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.rs index 4cd25af7d6..ca55923d9f 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 @@ -3,7 +3,7 @@ use std::sync::Arc; use anyhow::anyhow; use client_api::entity::billing_dto::{ - SubscriptionPlan, SubscriptionStatus, WorkspaceSubscriptionStatus, + SubscriptionCancelRequest, SubscriptionPlan, SubscriptionStatus, WorkspaceSubscriptionStatus, }; use client_api::entity::workspace_dto::{ CreateWorkspaceParam, PatchWorkspaceParam, WorkspaceMemberChangeset, WorkspaceMemberInvitation, @@ -543,9 +543,13 @@ where let try_get_client = self.server.try_get_client(); FutureResult::new(async move { let client = try_get_client?; - client - .cancel_subscription(&workspace_id, &SubscriptionPlan::Pro) - .await?; // TODO: + let request = SubscriptionCancelRequest { + workspace_id, + plan: SubscriptionPlan::Pro, + sync: false, + reason: Some("User requested".to_string()), + }; + client.cancel_subscription(&request).await?; Ok(()) }) }