Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore: fix database test (#4893)

Nathan.fooofd81d64a3259
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock
index 4217b995b9..30c6d31682 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock
@@ -162,7 +162,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
[[package]]
name = "app-error"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -714,7 +714,7 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"again",
"anyhow",
@@ -818,7 +818,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-trait",
@@ -841,7 +841,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-trait",
@@ -871,7 +871,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"collab",
@@ -890,7 +890,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"bytes",
@@ -905,7 +905,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"chrono",
@@ -942,7 +942,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-stream",
@@ -981,7 +981,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"collab",
@@ -1204,7 +1204,7 @@ dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa 1.0.6",
- "phf 0.8.0",
+ "phf 0.11.2",
"smallvec",
]
@@ -1315,7 +1315,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -2022,6 +2022,7 @@ dependencies = [
"mime_guess",
"parking_lot 0.12.1",
"postgrest",
+ "rand 0.8.5",
"reqwest",
"serde",
"serde_json",
@@ -2589,7 +2590,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"futures-util",
@@ -2606,7 +2607,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -3061,7 +3062,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"reqwest",
@@ -4803,7 +4804,7 @@ dependencies = [
[[package]]
name = "realtime-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -4827,7 +4828,7 @@ dependencies = [
[[package]]
name = "realtime-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -5499,7 +5500,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -6995,7 +6996,7 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
[[package]]
name = "websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"futures-channel",
"futures-util",
@@ -7458,7 +7459,7 @@ dependencies = [
[[package]]
name = "workspace-template"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"async-trait",
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml
index f838297556..aaf839df34 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml
@@ -82,7 +82,7 @@ custom-protocol = ["tauri/custom-protocol"]
# Run the script:
# scripts/tool/update_client_api_rev.sh new_rev_id
# ⚠️⚠️⚠️️
-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e14d3b25d63425084ae908ce8f69ae0c9d6641" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "40fc18a49997bb445c312f725b6850850b5f4db3" }
# Please use the following script to update collab.
# Working directory: frontend
#
@@ -92,10 +92,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock
index ac9a044701..ee941279f4 100644
--- a/frontend/appflowy_web/wasm-libs/Cargo.lock
+++ b/frontend/appflowy_web/wasm-libs/Cargo.lock
@@ -221,7 +221,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
[[package]]
name = "app-error"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -545,7 +545,7 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"again",
"anyhow",
@@ -618,7 +618,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-trait",
@@ -641,7 +641,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"collab",
@@ -660,7 +660,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"bytes",
@@ -675,7 +675,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"chrono",
@@ -712,7 +712,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-stream",
@@ -750,7 +750,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"collab",
@@ -902,7 +902,7 @@ dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa",
- "phf 0.11.2",
+ "phf 0.8.0",
"smallvec",
]
@@ -947,7 +947,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -1701,7 +1701,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"futures-util",
@@ -1718,7 +1718,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -2052,7 +2052,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"reqwest",
@@ -2781,7 +2781,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
- "phf_macros 0.8.0",
+ "phf_macros",
"phf_shared 0.8.0",
"proc-macro-hack",
]
@@ -2801,7 +2801,6 @@ 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",
]
@@ -2869,19 +2868,6 @@ 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.48",
-]
-
[[package]]
name = "phf_shared"
version = "0.8.0"
@@ -3310,7 +3296,7 @@ dependencies = [
[[package]]
name = "realtime-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -3334,7 +3320,7 @@ dependencies = [
[[package]]
name = "realtime-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -3787,7 +3773,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -4729,7 +4715,7 @@ checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
[[package]]
name = "websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"futures-channel",
"futures-util",
@@ -5037,4 +5023,4 @@ dependencies = [
[[patch.unused]]
name = "collab-database"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml
index 499f27ffb8..c9e1567e7f 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 = "47e14d3b25d63425084ae908ce8f69ae0c9d6641" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "40fc18a49997bb445c312f725b6850850b5f4db3" }
# Please use the following script to update collab.
# Working directory: frontend
#
@@ -65,10 +65,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index d032eb95b4..041993fc90 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -163,7 +163,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
[[package]]
name = "app-error"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -673,7 +673,7 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"again",
"anyhow",
@@ -746,7 +746,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-trait",
@@ -769,7 +769,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-trait",
@@ -799,7 +799,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"collab",
@@ -818,7 +818,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"bytes",
@@ -833,7 +833,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"chrono",
@@ -870,7 +870,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"async-stream",
@@ -909,7 +909,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3079e1cef184bf5ddfecbc6999a450ae9ac070a7#3079e1cef184bf5ddfecbc6999a450ae9ac070a7"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8f6dba45acbd42b4611ed94add13872706cda6e7#8f6dba45acbd42b4611ed94add13872706cda6e7"
dependencies = [
"anyhow",
"collab",
@@ -1106,7 +1106,7 @@ dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa",
- "phf 0.11.2",
+ "phf 0.8.0",
"smallvec",
]
@@ -1239,7 +1239,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -2015,6 +2015,7 @@ dependencies = [
"mime_guess",
"parking_lot 0.12.1",
"postgrest",
+ "rand 0.8.5",
"reqwest",
"serde",
"serde_json",
@@ -2413,7 +2414,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"futures-util",
@@ -2430,7 +2431,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -2824,7 +2825,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"reqwest",
@@ -3644,7 +3645,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
- "phf_macros 0.8.0",
+ "phf_macros",
"phf_shared 0.8.0",
"proc-macro-hack",
]
@@ -3664,7 +3665,6 @@ 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",
]
@@ -3732,19 +3732,6 @@ 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"
@@ -4321,7 +4308,7 @@ dependencies = [
[[package]]
name = "realtime-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -4345,7 +4332,7 @@ dependencies = [
[[package]]
name = "realtime-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"bincode",
@@ -4939,7 +4926,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"app-error",
@@ -6129,7 +6116,7 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
[[package]]
name = "websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"futures-channel",
"futures-util",
@@ -6370,7 +6357,7 @@ dependencies = [
[[package]]
name = "workspace-template"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=47e14d3b25d63425084ae908ce8f69ae0c9d6641#47e14d3b25d63425084ae908ce8f69ae0c9d6641"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=40fc18a49997bb445c312f725b6850850b5f4db3#40fc18a49997bb445c312f725b6850850b5f4db3"
dependencies = [
"anyhow",
"async-trait",
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index 83d2d3d96e..a066acdb5b 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -105,7 +105,7 @@ incremental = false
# Run the script:
# scripts/tool/update_client_api_rev.sh new_rev_id
# ⚠️⚠️⚠️️
-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e14d3b25d63425084ae908ce8f69ae0c9d6641" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "40fc18a49997bb445c312f725b6850850b5f4db3" }
# Please use the following script to update collab.
# Working directory: frontend
#
@@ -115,10 +115,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "47e
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3079e1cef184bf5ddfecbc6999a450ae9ac070a7" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8f6dba45acbd42b4611ed94add13872706cda6e7" }
diff --git a/frontend/rust-lib/event-integration/src/folder_event.rs b/frontend/rust-lib/event-integration/src/folder_event.rs
index 1daae0d35d..c189e4fb26 100644
--- a/frontend/rust-lib/event-integration/src/folder_event.rs
+++ b/frontend/rust-lib/event-integration/src/folder_event.rs
@@ -8,7 +8,6 @@ use flowy_user::entities::{
};
use flowy_user::errors::FlowyError;
use flowy_user::event_map::UserEvent;
-use tokio::time::sleep;
use crate::event_builder::EventBuilder;
use crate::EventIntegrationTest;
@@ -182,23 +181,15 @@ impl ViewTest {
}
pub async fn new_grid_view(sdk: &EventIntegrationTest, data: Vec<u8>) -> Self {
- // TODO(nathan): remove this sleep
- // workaround for the rows that are created asynchronously
- let this = Self::new(sdk, ViewLayoutPB::Grid, data).await;
- sleep(tokio::time::Duration::from_secs(2)).await;
- this
+ Self::new(sdk, ViewLayoutPB::Grid, data).await
}
pub async fn new_board_view(sdk: &EventIntegrationTest, data: Vec<u8>) -> Self {
- let this = Self::new(sdk, ViewLayoutPB::Board, data).await;
- sleep(tokio::time::Duration::from_secs(2)).await;
- this
+ Self::new(sdk, ViewLayoutPB::Board, data).await
}
pub async fn new_calendar_view(sdk: &EventIntegrationTest, data: Vec<u8>) -> Self {
- let this = Self::new(sdk, ViewLayoutPB::Calendar, data).await;
- sleep(tokio::time::Duration::from_secs(2)).await;
- this
+ Self::new(sdk, ViewLayoutPB::Calendar, data).await
}
}
diff --git a/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs b/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs
index 4d73df4482..34ef732f39 100644
--- a/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs
+++ b/frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs
@@ -2,8 +2,6 @@ use flowy_database2::entities::FieldType;
use flowy_database2::services::cell::stringify_cell_data;
use flowy_database2::services::field::CHECK;
use flowy_database2::services::share::csv::CSVFormat;
-use std::time::Duration;
-use tokio::time::sleep;
use crate::database::database_editor::DatabaseEditorTest;
@@ -50,9 +48,6 @@ async fn export_and_then_import_meta_csv_test() {
let csv_1 = database.export_csv(format).await.unwrap();
let result = test.import(csv_1.clone(), format).await;
- // TODO(nathan): remove this sleep
- // workaround for the rows that are created asynchronously
- sleep(Duration::from_secs(2)).await;
let database = test.get_database(&result.database_id).await.unwrap();
let fields = database.get_fields(&result.view_id, None);
@@ -129,9 +124,6 @@ async fn history_database_import_test() {
"{""data"":""AE"",""field_type"":0}","{""data"":""5"",""field_type"":1}","{""data"":""1671938394"",""field_type"":2}","{""data"":""wQpG"",""field_type"":3}","{""data"":"""",""field_type"":4}","{""data"":""Yes"",""field_type"":5}","{""data"":"""",""field_type"":6}","{""data"":"""",""field_type"":7}"
"#;
let result = test.import(csv.to_string(), format).await;
- // TODO(nathan): remove this sleep
- // workaround for the rows that are created asynchronously
- tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
let database = test.get_database(&result.database_id).await.unwrap();
let fields = database.get_fields(&result.view_id, None);
diff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.toml
index 4cfc90ae75..1ee765f25f 100644
--- a/frontend/rust-lib/flowy-server/Cargo.toml
+++ b/frontend/rust-lib/flowy-server/Cargo.toml
@@ -48,6 +48,7 @@ tokio-stream = { workspace = true, features = ["sync"] }
client-api = { version = "0.1.0", features = ["collab-sync", "test_util"] }
lib-dispatch = { workspace = true }
yrs = "0.17.1"
+rand = "0.8.5"
[dev-dependencies]
uuid.workspace = true
diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/server.rs b/frontend/rust-lib/flowy-server/src/af_cloud/server.rs
index 27f31dab1d..18e7d7ad3f 100644
--- a/frontend/rust-lib/flowy-server/src/af_cloud/server.rs
+++ b/frontend/rust-lib/flowy-server/src/af_cloud/server.rs
@@ -11,6 +11,7 @@ use client_api::ws::{
};
use client_api::{Client, ClientConfiguration};
use flowy_storage::ObjectStorageService;
+use rand::Rng;
use tokio::sync::watch;
use tokio_stream::wrappers::WatchStream;
use tracing::{error, event, info, warn};
@@ -253,16 +254,7 @@ fn spawn_ws_conn(
// Try to reconnect if the connection is timed out.
if let Some(api_client) = weak_api_client.upgrade() {
if enable_sync.load(Ordering::SeqCst) {
- match api_client.ws_connect_info().await {
- Ok(conn_info) => {
- // sleep two seconds and then try to reconnect
- tokio::time::sleep(Duration::from_secs(2)).await;
-
- event!(tracing::Level::INFO, "🟢reconnecting websocket");
- let _ = ws_client.connect(api_client.ws_addr(), conn_info).await;
- },
- Err(err) => error!("Failed to get ws url: {}, connect state:{:?}", err, state),
- }
+ attempt_reconnect(&ws_client, &api_client, 2).await;
}
}
},
@@ -308,6 +300,28 @@ fn spawn_ws_conn(
});
}
+async fn attempt_reconnect(
+ ws_client: &Arc<WSClient>,
+ api_client: &Arc<Client>,
+ minimum_delay: u64,
+) {
+ // Introduce randomness in the reconnection attempts to avoid thundering herd problem
+ let delay_seconds = rand::thread_rng().gen_range(minimum_delay..8);
+ tokio::time::sleep(Duration::from_secs(delay_seconds)).await;
+ event!(
+ tracing::Level::INFO,
+ "🟢 Attempting to reconnect websocket."
+ );
+ match api_client.ws_connect_info().await {
+ Ok(conn_info) => {
+ if let Err(e) = ws_client.connect(api_client.ws_addr(), conn_info).await {
+ error!("Failed to reconnect websocket: {}", e);
+ }
+ },
+ Err(err) => error!("Failed to get websocket URL: {}", err),
+ }
+}
+
pub trait AFServer: Send + Sync + 'static {
fn get_client(&self) -> Option<Arc<AFCloudClient>>;
fn try_get_client(&self) -> Result<Arc<AFCloudClient>, Error>;
diff --git a/frontend/rust-lib/lib-dispatch/src/module/module.rs b/frontend/rust-lib/lib-dispatch/src/module/module.rs
index 1e0a81016b..a5b2df234a 100644
--- a/frontend/rust-lib/lib-dispatch/src/module/module.rs
+++ b/frontend/rust-lib/lib-dispatch/src/module/module.rs
@@ -34,7 +34,7 @@ pub(crate) fn plugin_map_or_crash(plugins: Vec<AFPlugin>) -> AFPluginMap {
let plugins = Arc::new(m);
events.into_iter().for_each(|e| {
if plugin_map.contains_key(&e) {
- let plugin_name = plugin_map.get(&e).and_then(|p| Some(&p.name));
+ let plugin_name = plugin_map.get(&e).map(|p| &p.name);
panic!("⚠️⚠️⚠️Error: {:?} is already defined in {:?}", &e, plugin_name,);
}
plugin_map.insert(e, plugins.clone());