Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: update yrs dependencies (#6086)
Bartosz Sypytkowskib77fdb84248a
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex 2ce293ab17..4b8421d9c3 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=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"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=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bytes",@@ -291,6 +291,17 @@ version = "0.7.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"+[[package]]+name = "async-lock"+version = "3.4.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"+dependencies = [+ "event-listener",+ "event-listener-strategy",+ "pin-project-lite",+]+[[package]]name = "async-stream"version = "0.3.5"@@ -826,7 +837,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["again","anyhow",@@ -877,7 +888,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["collab-entity","collab-rt-entity",@@ -890,7 +901,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["futures-channel","futures-util",@@ -964,7 +975,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -989,7 +1000,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","async-trait",@@ -1018,7 +1029,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -1038,7 +1049,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","bytes",@@ -1057,7 +1068,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -1100,7 +1111,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","async-stream",@@ -1138,7 +1149,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bincode",@@ -1163,7 +1174,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","async-trait",@@ -1180,7 +1191,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","collab",@@ -1209,6 +1220,15 @@ dependencies = ["memchr",]+[[package]]+name = "concurrent-queue"+version = "2.5.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"+dependencies = [+ "crossbeam-utils",+]+[[package]]name = "console"version = "0.14.1"@@ -1426,7 +1446,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.6",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1551,7 +1571,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -1864,6 +1884,27 @@ dependencies = ["windows-sys 0.52.0",]+[[package]]+name = "event-listener"+version = "5.3.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"+dependencies = [+ "concurrent-queue",+ "parking",+ "pin-project-lite",+]++[[package]]+name = "event-listener-strategy"+version = "0.5.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"+dependencies = [+ "event-listener",+ "pin-project-lite",+]+[[package]]name = "faccess"version = "0.2.4"@@ -3076,7 +3117,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","futures-util",@@ -3093,7 +3134,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -3525,7 +3566,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bytes",@@ -4615,6 +4656,12 @@ dependencies = ["system-deps 6.1.1",]+[[package]]+name = "parking"+version = "2.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"+[[package]]name = "parking_lot"version = "0.11.2"@@ -6122,7 +6169,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -8400,12 +8447,14 @@ dependencies = [[[package]]name = "yrs"-version = "0.19.2"+version = "0.21.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176"+checksum = "a8fc56b25e3aaf4b81a73f2a9a68ceae1e02d9005552e24058cfb9f96db73f33"dependencies = ["arc-swap",- "atomic_refcell",+ "async-lock",+ "async-trait",+ "dashmap 6.0.1","fastrand","serde","serde_json",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex 7534f49a91..32cf0aa188 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 = "c8ee6b43eefbe79e171447dea0e310e1abcbcfdf" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5badffc97b17984d5f25a178c0c5a477338039c4" }[dependencies]serde_json.workspace = true@@ -116,13 +116,13 @@ custom-protocol = ["tauri/custom-protocol"]# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lockindex 43c201c6d8..f176748d1e 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=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"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=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bytes",@@ -301,6 +301,17 @@ version = "0.7.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"+[[package]]+name = "async-lock"+version = "3.4.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"+dependencies = [+ "event-listener",+ "event-listener-strategy",+ "pin-project-lite",+]+[[package]]name = "async-stream"version = "0.3.5"@@ -800,7 +811,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["again","anyhow",@@ -851,7 +862,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["collab-entity","collab-rt-entity",@@ -864,7 +875,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["futures-channel","futures-util",@@ -947,7 +958,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -972,7 +983,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","async-trait",@@ -1001,7 +1012,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -1021,7 +1032,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","bytes",@@ -1040,7 +1051,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -1083,7 +1094,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","async-stream",@@ -1121,7 +1132,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bincode",@@ -1146,7 +1157,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","async-trait",@@ -1163,7 +1174,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","collab",@@ -1192,6 +1203,15 @@ dependencies = ["memchr",]+[[package]]+name = "concurrent-queue"+version = "2.5.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"+dependencies = [+ "crossbeam-utils",+]+[[package]]name = "console"version = "0.14.1"@@ -1416,7 +1436,7 @@ dependencies = ["cssparser-macros","dtoa-short","itoa 1.0.10",- "phf 0.8.0",+ "phf 0.11.2","smallvec",]@@ -1541,7 +1561,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -1894,6 +1914,27 @@ version = "3.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"+[[package]]+name = "event-listener"+version = "5.3.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"+dependencies = [+ "concurrent-queue",+ "parking",+ "pin-project-lite",+]++[[package]]+name = "event-listener-strategy"+version = "0.5.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"+dependencies = [+ "event-listener",+ "pin-project-lite",+]+[[package]]name = "faccess"version = "0.2.4"@@ -3143,7 +3184,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","futures-util",@@ -3160,7 +3201,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -3597,7 +3638,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bytes",@@ -4677,6 +4718,12 @@ dependencies = ["system-deps 6.2.2",]+[[package]]+name = "parking"+version = "2.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"+[[package]]name = "parking_lot"version = "0.11.2"@@ -6186,7 +6233,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -8658,12 +8705,14 @@ dependencies = [[[package]]name = "yrs"-version = "0.19.2"+version = "0.21.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176"+checksum = "a8fc56b25e3aaf4b81a73f2a9a68ceae1e02d9005552e24058cfb9f96db73f33"dependencies = ["arc-swap",- "atomic_refcell",+ "async-lock",+ "async-trait",+ "dashmap 6.0.1","fastrand","serde","serde_json",diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.tomlindex b6c575fb0e..588364dbfa 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 = "c8ee6b43eefbe79e171447dea0e310e1abcbcfdf" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5badffc97b17984d5f25a178c0c5a477338039c4" }[dependencies]serde_json.workspace = true@@ -116,13 +116,13 @@ custom-protocol = ["tauri/custom-protocol"]# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 8b709b8d2b..ea1cc43186 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=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"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=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bytes",@@ -265,6 +265,17 @@ dependencies = ["serde_json",]+[[package]]+name = "async-lock"+version = "3.4.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"+dependencies = [+ "event-listener",+ "event-listener-strategy",+ "pin-project-lite",+]+[[package]]name = "async-stream"version = "0.3.5"@@ -718,7 +729,7 @@ dependencies = [[[package]]name = "client-api"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["again","anyhow",@@ -769,7 +780,7 @@ dependencies = [[[package]]name = "client-api-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["collab-entity","collab-rt-entity",@@ -782,7 +793,7 @@ dependencies = [[[package]]name = "client-websocket"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["futures-channel","futures-util",@@ -825,7 +836,7 @@ dependencies = [[[package]]name = "collab"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -850,7 +861,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","async-trait",@@ -879,7 +890,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -899,7 +910,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","bytes",@@ -918,7 +929,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","arc-swap",@@ -961,7 +972,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","async-stream",@@ -999,7 +1010,7 @@ dependencies = [[[package]]name = "collab-rt-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bincode",@@ -1024,7 +1035,7 @@ dependencies = [[[package]]name = "collab-rt-protocol"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","async-trait",@@ -1041,7 +1052,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.2.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=ec4f92941942f20c84dce142cd2eeafd44ca7362#ec4f92941942f20c84dce142cd2eeafd44ca7362"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=49cf2206d7494bb3006402b807e7f171905213e3#49cf2206d7494bb3006402b807e7f171905213e3"dependencies = ["anyhow","collab",@@ -1054,6 +1065,15 @@ dependencies = ["tracing",]+[[package]]+name = "concurrent-queue"+version = "2.5.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"+dependencies = [+ "crossbeam-utils",+]+[[package]]name = "console"version = "0.14.1"@@ -1375,7 +1395,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"[[package]]name = "database-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -1683,6 +1703,27 @@ dependencies = ["zip 2.1.3",]+[[package]]+name = "event-listener"+version = "5.3.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"+dependencies = [+ "concurrent-queue",+ "parking",+ "pin-project-lite",+]++[[package]]+name = "event-listener-strategy"+version = "0.5.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"+dependencies = [+ "event-listener",+ "pin-project-lite",+]+[[package]]name = "faccess"version = "0.2.4"@@ -2754,7 +2795,7 @@ dependencies = [[[package]]name = "gotrue"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","futures-util",@@ -2771,7 +2812,7 @@ dependencies = [[[package]]name = "gotrue-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -3136,7 +3177,7 @@ dependencies = [[[package]]name = "infra"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","bytes",@@ -3925,6 +3966,12 @@ dependencies = ["stable_deref_trait",]+[[package]]+name = "parking"+version = "2.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"+[[package]]name = "parking_lot"version = "0.11.2"@@ -5330,7 +5377,7 @@ dependencies = [[[package]]name = "shared-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c8ee6b43eefbe79e171447dea0e310e1abcbcfdf#c8ee6b43eefbe79e171447dea0e310e1abcbcfdf"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=5badffc97b17984d5f25a178c0c5a477338039c4#5badffc97b17984d5f25a178c0c5a477338039c4"dependencies = ["anyhow","app-error",@@ -6984,12 +7031,14 @@ dependencies = [[[package]]name = "yrs"-version = "0.19.2"+version = "0.21.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176"+checksum = "a8fc56b25e3aaf4b81a73f2a9a68ceae1e02d9005552e24058cfb9f96db73f33"dependencies = ["arc-swap",- "atomic_refcell",+ "async-lock",+ "async-trait",+ "dashmap 6.0.1","fastrand","serde","serde_json",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex aa282e972b..22e4d9cc70 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -89,7 +89,7 @@ collab-document = { version = "0.2" }collab-database = { version = "0.2" }collab-plugins = { version = "0.2" }collab-user = { version = "0.2" }-yrs = "0.19.2"+yrs = "0.21.0"validator = { version = "0.16.1", features = ["derive"] }tokio-util = "0.7.11"zip = "2.1.3"@@ -100,8 +100,8 @@ dashmap = "6.0.1"# 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 = "c8ee6b43eefbe79e171447dea0e310e1abcbcfdf" }-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c8ee6b43eefbe79e171447dea0e310e1abcbcfdf" }+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5badffc97b17984d5f25a178c0c5a477338039c4" }+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "5badffc97b17984d5f25a178c0c5a477338039c4" }[profile.dev]opt-level = 0@@ -136,13 +136,13 @@ rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "ec4f92941942f20c84dce142cd2eeafd44ca7362" }+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "49cf2206d7494bb3006402b807e7f171905213e3" }# Working directory: frontend# To update the commit ID, run:diff --git a/frontend/rust-lib/event-integration-test/src/document_event.rs b/frontend/rust-lib/event-integration-test/src/document_event.rsindex 407dcfe066..96c1b41e42 100644--- a/frontend/rust-lib/event-integration-test/src/document_event.rs+++ b/frontend/rust-lib/event-integration-test/src/document_event.rs@@ -108,7 +108,7 @@ pub fn assert_document_data_equal(doc_state: &[u8], doc_id: &str, expected: Docu{let update = Update::decode_v1(doc_state).unwrap();let mut txn = collab.transact_mut();- txn.apply_update(update);+ txn.apply_update(update).unwrap();};let document = Document::open(collab).unwrap();let actual = document.get_document_data().unwrap();diff --git a/frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rs b/frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rsindex 8c668afeac..c1874a5004 100644--- a/frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rs+++ b/frontend/rust-lib/event-integration-test/tests/database/supabase_test/helper.rs@@ -90,7 +90,7 @@ pub fn assert_database_collab_content());collab.lock().with_origin_transact_mut(|txn| {let update = Update::decode_v1(collab_update).unwrap();- txn.apply_update(update);+ txn.apply_update(update).unwrap();});let json = collab.to_json_value();diff --git a/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rs b/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rsindex ed701fd1a7..a1179ce6cc 100644--- a/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rs+++ b/frontend/rust-lib/event-integration-test/tests/folder/supabase_test/helper.rs@@ -75,7 +75,7 @@ pub fn assert_folder_collab_content(workspace_id: &str, collab_update: &[u8], ex));collab.lock().with_origin_transact_mut(|txn| {let update = Update::decode_v1(collab_update).unwrap();- txn.apply_update(update);+ txn.apply_update(update).unwrap();});let json = collab.to_json_value();diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rsindex 5d7922a1e4..a9037caa6c 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs@@ -194,7 +194,7 @@ async fn supabase_duplicate_updates_test() {{let mut txn = doc_2.transact_mut();let update = Update::decode_v1(&second_init_sync_update).unwrap();- txn.apply_update(update);+ txn.apply_update(update).unwrap();}{let txn = doc_2.transact();@@ -282,7 +282,7 @@ async fn supabase_diff_state_vector_test() {{let mut txn = old_version_doc.transact_mut();let update = Update::decode_v1(&doc_state).unwrap();- txn.apply_update(update);+ txn.apply_update(update).unwrap();}let txn = old_version_doc.transact();let json = map.to_json(&txn);diff --git a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rsindex f7579d73e6..f05750c1f9 100644--- a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs+++ b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs@@ -563,8 +563,14 @@ wherelet doc = Doc::new();{let mut txn = doc.transact_mut();- txn.apply_update(update);- drop(txn);+ if let Err(e) = txn.apply_update(update) {+ error!(+ "Collab {} failed to apply update: {}",+ collab.object_id(),+ e+ );+ return;+ }}let txn = doc.transact();