mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
chore: update collab rev (#3874)
This commit is contained in:
Nathan.fooo
GitHub
parent
1025b6d553
commit
3434d447a7
35
frontend/appflowy_tauri/src-tauri/Cargo.lock
generated
35
frontend/appflowy_tauri/src-tauri/Cargo.lock
generated
@ -138,7 +138,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
|
||||
[[package]]
|
||||
name = "app-error"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"reqwest",
|
||||
@ -768,7 +768,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "client-api"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
@ -861,10 +861,11 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"bincode",
|
||||
"bytes",
|
||||
"lib0",
|
||||
"parking_lot",
|
||||
@ -880,7 +881,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-database"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -910,7 +911,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-derive"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -922,7 +923,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-document"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"collab",
|
||||
@ -942,7 +943,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
@ -956,7 +957,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-folder"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@ -998,7 +999,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-persistence"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bincode",
|
||||
@ -1019,7 +1020,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-plugins"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -1046,7 +1047,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-user"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"collab",
|
||||
@ -1445,7 +1446,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
|
||||
[[package]]
|
||||
name = "database-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
@ -2795,7 +2796,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "gotrue"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"futures-util",
|
||||
@ -2811,7 +2812,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "gotrue-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
@ -3247,7 +3248,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "infra"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"reqwest",
|
||||
@ -4921,7 +4922,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "realtime-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
@ -5660,7 +5661,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "shared_entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
|
||||
@ -38,7 +38,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 = "c739029d99517282d2ec1593523a47b51a85231b" }
|
||||
client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "7752ab68a91ff742fae595c1b45babdc17927fea" }
|
||||
# Please use the following script to update collab.
|
||||
# Working directory: frontend
|
||||
#
|
||||
@ -48,14 +48,14 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c73
|
||||
# To switch to the local path, run:
|
||||
# scripts/tool/update_collab_source.sh
|
||||
# ⚠️⚠️⚠️️
|
||||
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
|
||||
|
||||
|
||||
|
||||
37
frontend/rust-lib/Cargo.lock
generated
37
frontend/rust-lib/Cargo.lock
generated
@ -124,7 +124,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
|
||||
[[package]]
|
||||
name = "app-error"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"reqwest",
|
||||
@ -467,7 +467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
|
||||
dependencies = [
|
||||
"borsh-derive",
|
||||
"hashbrown 0.13.2",
|
||||
"hashbrown 0.12.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -666,7 +666,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "client-api"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
@ -728,10 +728,11 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"bincode",
|
||||
"bytes",
|
||||
"lib0",
|
||||
"parking_lot",
|
||||
@ -747,7 +748,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-database"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -777,7 +778,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-derive"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -789,7 +790,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-document"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"collab",
|
||||
@ -809,7 +810,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
@ -823,7 +824,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-folder"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@ -865,7 +866,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-persistence"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bincode",
|
||||
@ -886,7 +887,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-plugins"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -913,7 +914,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "collab-user"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bab20052#bab200529ef0306194fa8618cc8708878b01ce04"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=faf17b54#faf17b54ead0c1286e4ba8332d25e42bf1e1d627"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"collab",
|
||||
@ -1272,7 +1273,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
|
||||
[[package]]
|
||||
name = "database-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
@ -2454,7 +2455,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "gotrue"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"futures-util",
|
||||
@ -2470,7 +2471,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "gotrue-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
@ -2831,7 +2832,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "infra"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"reqwest",
|
||||
@ -4271,7 +4272,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "realtime-entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
@ -4909,7 +4910,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "shared_entity"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=c739029d99517282d2ec1593523a47b51a85231b#c739029d99517282d2ec1593523a47b51a85231b"
|
||||
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=7752ab68a91ff742fae595c1b45babdc17927fea#7752ab68a91ff742fae595c1b45babdc17927fea"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"app-error",
|
||||
|
||||
@ -82,7 +82,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 = "c739029d99517282d2ec1593523a47b51a85231b" }
|
||||
client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "7752ab68a91ff742fae595c1b45babdc17927fea" }
|
||||
# Please use the following script to update collab.
|
||||
# Working directory: frontend
|
||||
#
|
||||
@ -92,11 +92,11 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "c73
|
||||
# To switch to the local path, run:
|
||||
# scripts/tool/update_collab_source.sh
|
||||
# ⚠️⚠️⚠️️
|
||||
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bab20052" }
|
||||
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "faf17b54" }
|
||||
|
||||
@ -126,7 +126,7 @@ impl DocumentManager {
|
||||
"can't find the document in the cloud, doc_id: {}",
|
||||
doc_id
|
||||
);
|
||||
default_document_collab_data(doc_id)
|
||||
vec![default_document_collab_data(doc_id).doc_state.to_vec()]
|
||||
} else {
|
||||
return Err(err);
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ use anyhow::Error;
|
||||
use client_api::entity::QueryCollabResult::{Failed, Success};
|
||||
use client_api::entity::{BatchQueryCollab, BatchQueryCollabParams, QueryCollabParams};
|
||||
use client_api::error::ErrorCode::RecordNotFound;
|
||||
use collab::core::collab_plugin::EncodedCollabV1;
|
||||
use collab_entity::CollabType;
|
||||
use tracing::error;
|
||||
|
||||
@ -34,7 +35,7 @@ where
|
||||
collab_type,
|
||||
};
|
||||
match try_get_client?.get_collab(params).await {
|
||||
Ok(data) => Ok(vec![data]),
|
||||
Ok(data) => Ok(vec![data.doc_state.to_vec()]),
|
||||
Err(err) => {
|
||||
if err.code == RecordNotFound {
|
||||
Ok(vec![])
|
||||
@ -71,7 +72,15 @@ where
|
||||
.0
|
||||
.into_iter()
|
||||
.flat_map(|(object_id, result)| match result {
|
||||
Success { blob } => Some((object_id, vec![blob])),
|
||||
Success { encode_collab_v1 } => {
|
||||
match EncodedCollabV1::decode_from_bytes(&encode_collab_v1) {
|
||||
Ok(encode) => Some((object_id, vec![encode.doc_state.to_vec()])),
|
||||
Err(err) => {
|
||||
error!("Failed to decode collab: {}", err);
|
||||
None
|
||||
},
|
||||
}
|
||||
},
|
||||
Failed { error } => {
|
||||
error!("Failed to get {} update: {}", object_id, error);
|
||||
None
|
||||
|
||||
@ -33,7 +33,9 @@ where
|
||||
let data = try_get_client?
|
||||
.get_collab(params)
|
||||
.await
|
||||
.map_err(FlowyError::from)?;
|
||||
.map_err(FlowyError::from)?
|
||||
.doc_state
|
||||
.to_vec();
|
||||
Ok(vec![data])
|
||||
})
|
||||
}
|
||||
@ -61,11 +63,14 @@ where
|
||||
object_id: document_id.clone(),
|
||||
collab_type: CollabType::Document,
|
||||
};
|
||||
let updates = vec![try_get_client?
|
||||
let doc_state = try_get_client?
|
||||
.get_collab(params)
|
||||
.await
|
||||
.map_err(FlowyError::from)?];
|
||||
let document = Document::from_updates(CollabOrigin::Empty, updates, &document_id, vec![])?;
|
||||
.map_err(FlowyError::from)?
|
||||
.doc_state
|
||||
.to_vec();
|
||||
let document =
|
||||
Document::from_updates(CollabOrigin::Empty, vec![doc_state], &document_id, vec![])?;
|
||||
Ok(document.get_document_data().ok())
|
||||
})
|
||||
}
|
||||
|
||||
@ -64,12 +64,19 @@ where
|
||||
workspace_id: workspace_id.clone(),
|
||||
collab_type: CollabType::Folder,
|
||||
};
|
||||
let updates = vec![try_get_client?
|
||||
let doc_state = try_get_client?
|
||||
.get_collab(params)
|
||||
.await
|
||||
.map_err(FlowyError::from)?];
|
||||
let folder =
|
||||
Folder::from_collab_raw_data(uid, CollabOrigin::Empty, updates, &workspace_id, vec![])?;
|
||||
.map_err(FlowyError::from)?
|
||||
.doc_state
|
||||
.to_vec();
|
||||
let folder = Folder::from_collab_raw_data(
|
||||
uid,
|
||||
CollabOrigin::Empty,
|
||||
vec![doc_state],
|
||||
&workspace_id,
|
||||
vec![],
|
||||
)?;
|
||||
Ok(folder.get_folder_data())
|
||||
})
|
||||
}
|
||||
@ -91,11 +98,13 @@ where
|
||||
workspace_id,
|
||||
collab_type: CollabType::Folder,
|
||||
};
|
||||
let update = try_get_client?
|
||||
let doc_state = try_get_client?
|
||||
.get_collab(params)
|
||||
.await
|
||||
.map_err(FlowyError::from)?;
|
||||
Ok(vec![update])
|
||||
.map_err(FlowyError::from)?
|
||||
.doc_state
|
||||
.to_vec();
|
||||
Ok(vec![doc_state])
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -283,7 +283,7 @@ where
|
||||
|
||||
let try_get_postgrest = self.server.try_get_weak_postgrest();
|
||||
let (tx, rx) = channel();
|
||||
let init_update = empty_workspace_update(&collab_object);
|
||||
let init_update = default_workspace_doc_state(&collab_object);
|
||||
af_spawn(async move {
|
||||
tx.send(
|
||||
async move {
|
||||
@ -607,7 +607,7 @@ impl RealtimeEventHandler for RealtimeCollabUpdateHandler {
|
||||
}
|
||||
}
|
||||
|
||||
fn empty_workspace_update(collab_object: &CollabObject) -> Vec<u8> {
|
||||
fn default_workspace_doc_state(collab_object: &CollabObject) -> Vec<u8> {
|
||||
let workspace_id = collab_object.object_id.clone();
|
||||
let collab = Arc::new(MutexCollab::new(
|
||||
CollabOrigin::Empty,
|
||||
@ -616,7 +616,7 @@ fn empty_workspace_update(collab_object: &CollabObject) -> Vec<u8> {
|
||||
));
|
||||
let workspace = Workspace::new(workspace_id, "My workspace".to_string());
|
||||
let folder = Folder::create(collab_object.uid, collab, None, FolderData::new(workspace));
|
||||
folder.encode_as_update_v1().0
|
||||
folder.encode_collab_v1().doc_state.to_vec()
|
||||
}
|
||||
|
||||
fn oauth_params_from_box_any(any: BoxAny) -> Result<SupabaseOAuthParams, Error> {
|
||||
|
||||
@ -101,25 +101,26 @@ fn sync_views(
|
||||
|
||||
match view.layout {
|
||||
ViewLayout::Document => {
|
||||
let update = get_collab_init_update(uid, &collab_object, &collab_db)?;
|
||||
let doc_state = get_collab_doc_state(uid, &collab_object, &collab_db)?;
|
||||
tracing::info!(
|
||||
"sync object: {} with update: {}",
|
||||
collab_object,
|
||||
update.len()
|
||||
doc_state.len()
|
||||
);
|
||||
user_service
|
||||
.create_collab_object(&collab_object, update)
|
||||
.create_collab_object(&collab_object, doc_state)
|
||||
.await?;
|
||||
},
|
||||
ViewLayout::Grid | ViewLayout::Board | ViewLayout::Calendar => {
|
||||
let (database_update, row_ids) = get_database_init_update(uid, &collab_object, &collab_db)?;
|
||||
let (database_doc_state, row_ids) =
|
||||
get_database_doc_state(uid, &collab_object, &collab_db)?;
|
||||
tracing::info!(
|
||||
"sync object: {} with update: {}",
|
||||
collab_object,
|
||||
database_update.len()
|
||||
database_doc_state.len()
|
||||
);
|
||||
user_service
|
||||
.create_collab_object(&collab_object, database_update)
|
||||
.create_collab_object(&collab_object, database_doc_state)
|
||||
.await?;
|
||||
|
||||
// sync database's row
|
||||
@ -134,16 +135,16 @@ fn sync_views(
|
||||
workspace_id.to_string(),
|
||||
device_id.clone(),
|
||||
);
|
||||
let database_row_update =
|
||||
get_collab_init_update(uid, &database_row_collab_object, &collab_db)?;
|
||||
let database_row_doc_state =
|
||||
get_collab_doc_state(uid, &database_row_collab_object, &collab_db)?;
|
||||
tracing::info!(
|
||||
"sync object: {} with update: {}",
|
||||
database_row_collab_object,
|
||||
database_row_update.len()
|
||||
database_row_doc_state.len()
|
||||
);
|
||||
|
||||
let _ = user_service
|
||||
.create_collab_object(&database_row_collab_object, database_row_update)
|
||||
.create_collab_object(&database_row_collab_object, database_row_doc_state)
|
||||
.await;
|
||||
|
||||
let database_row_document = CollabObject::new(
|
||||
@ -154,16 +155,16 @@ fn sync_views(
|
||||
device_id.to_string(),
|
||||
);
|
||||
// sync document in the row if exist
|
||||
if let Ok(document_update) =
|
||||
get_collab_init_update(uid, &database_row_document, &collab_db)
|
||||
if let Ok(document_doc_state) =
|
||||
get_collab_doc_state(uid, &database_row_document, &collab_db)
|
||||
{
|
||||
tracing::info!(
|
||||
"sync database row document: {} with update: {}",
|
||||
database_row_document,
|
||||
document_update.len()
|
||||
document_doc_state.len()
|
||||
);
|
||||
let _ = user_service
|
||||
.create_collab_object(&database_row_document, document_update)
|
||||
.create_collab_object(&database_row_document, document_doc_state)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
@ -197,7 +198,7 @@ fn sync_views(
|
||||
})
|
||||
}
|
||||
|
||||
fn get_collab_init_update(
|
||||
fn get_collab_doc_state(
|
||||
uid: i64,
|
||||
collab_object: &CollabObject,
|
||||
collab_db: &Arc<RocksCollabDB>,
|
||||
@ -208,15 +209,15 @@ fn get_collab_init_update(
|
||||
.read_txn()
|
||||
.load_doc_with_txn(uid, &collab_object.object_id, txn)
|
||||
})?;
|
||||
let update = collab.encode_as_update_v1().0;
|
||||
if update.is_empty() {
|
||||
let doc_state = collab.encode_collab_v1().doc_state;
|
||||
if doc_state.is_empty() {
|
||||
return Err(PersistenceError::UnexpectedEmptyUpdates);
|
||||
}
|
||||
|
||||
Ok(update)
|
||||
Ok(doc_state.to_vec())
|
||||
}
|
||||
|
||||
fn get_database_init_update(
|
||||
fn get_database_doc_state(
|
||||
uid: i64,
|
||||
collab_object: &CollabObject,
|
||||
collab_db: &Arc<RocksCollabDB>,
|
||||
@ -229,12 +230,12 @@ fn get_database_init_update(
|
||||
})?;
|
||||
|
||||
let row_ids = get_database_row_ids(&collab).unwrap_or_default();
|
||||
let update = collab.encode_as_update_v1().0;
|
||||
if update.is_empty() {
|
||||
let doc_state = collab.encode_collab_v1().doc_state;
|
||||
if doc_state.is_empty() {
|
||||
return Err(PersistenceError::UnexpectedEmptyUpdates);
|
||||
}
|
||||
|
||||
Ok((update, row_ids))
|
||||
Ok((doc_state.to_vec(), row_ids))
|
||||
}
|
||||
|
||||
async fn sync_folder(
|
||||
@ -252,14 +253,14 @@ async fn sync_folder(
|
||||
.read_txn()
|
||||
.load_doc_with_txn(uid, workspace_id, txn)
|
||||
})?;
|
||||
let update = collab.encode_as_update_v1().0;
|
||||
let doc_state = collab.encode_collab_v1().doc_state;
|
||||
(
|
||||
MutexFolder::new(Folder::open(
|
||||
uid,
|
||||
Arc::new(MutexCollab::from_collab(collab)),
|
||||
None,
|
||||
)?),
|
||||
update,
|
||||
doc_state,
|
||||
)
|
||||
};
|
||||
|
||||
@ -276,7 +277,7 @@ async fn sync_folder(
|
||||
update.len()
|
||||
);
|
||||
if let Err(err) = user_service
|
||||
.create_collab_object(&collab_object, update)
|
||||
.create_collab_object(&collab_object, update.to_vec())
|
||||
.await
|
||||
{
|
||||
tracing::error!("🔴sync folder failed: {:?}", err);
|
||||
@ -313,14 +314,14 @@ async fn sync_database_views(
|
||||
.map(|_| {
|
||||
(
|
||||
get_database_with_views(&collab),
|
||||
collab.encode_as_update_v1().0,
|
||||
collab.encode_collab_v1().doc_state,
|
||||
)
|
||||
})
|
||||
};
|
||||
|
||||
if let Ok((records, update)) = result {
|
||||
if let Ok((records, doc_state)) = result {
|
||||
let _ = user_service
|
||||
.create_collab_object(&collab_object, update)
|
||||
.create_collab_object(&collab_object, doc_state.to_vec())
|
||||
.await;
|
||||
records.into_iter().map(Arc::new).collect()
|
||||
} else {
|
||||
|
||||
@ -41,8 +41,13 @@ impl UserDataMigration for HistoricalEmptyDocumentMigration {
|
||||
let collab = Arc::new(MutexCollab::new(origin.clone(), &view.id, vec![]));
|
||||
if let Ok(document) = Document::create_with_data(collab.clone(), document_data) {
|
||||
// Remove all old updates and then insert the new update
|
||||
let (doc_state, sv) = document.get_collab().encode_as_update_v1();
|
||||
if let Err(err) = write_txn.flush_doc_with(session.user_id, &view.id, &doc_state, &sv) {
|
||||
let encode = document.get_collab().encode_collab_v1();
|
||||
if let Err(err) = write_txn.flush_doc_with(
|
||||
session.user_id,
|
||||
&view.id,
|
||||
&encode.doc_state,
|
||||
&encode.state_vector,
|
||||
) {
|
||||
event!(
|
||||
tracing::Level::ERROR,
|
||||
"Failed to migrate document {}, error: {}",
|
||||
|
||||
@ -37,9 +37,14 @@ impl UserDataMigration for FavoriteV1AndWorkspaceArrayMigration {
|
||||
folder.add_favorites(favorite_view_ids);
|
||||
}
|
||||
|
||||
let (doc_state, sv) = folder.encode_as_update_v1();
|
||||
let encode = folder.encode_collab_v1();
|
||||
write_txn
|
||||
.flush_doc_with(session.user_id, &session.user_workspace.id, &doc_state, &sv)
|
||||
.flush_doc_with(
|
||||
session.user_id,
|
||||
&session.user_workspace.id,
|
||||
&encode.doc_state,
|
||||
&encode.state_vector,
|
||||
)
|
||||
.map_err(internal_error)?;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user