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: bump client api and collab (#6563)

Nathan.fooo5f0cc1becdf4
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock
index f703c4a50f..3bdd6abe3b 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=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
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=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bytes",
@@ -291,6 +291,24 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+[[package]]
+name = "async-compression"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
+dependencies = [
+ "bzip2",
+ "deflate64",
+ "flate2",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "pin-project-lite",
+ "xz2",
+ "zstd",
+ "zstd-safe",
+]
+
[[package]]
name = "async-lock"
version = "3.4.0"
@@ -346,6 +364,22 @@ dependencies = [
"syn 2.0.47",
]
+[[package]]
+name = "async_zip"
+version = "0.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52"
+dependencies = [
+ "async-compression",
+ "chrono",
+ "crc32fast",
+ "futures-lite",
+ "pin-project",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+]
+
[[package]]
name = "atk"
version = "0.15.1"
@@ -848,13 +882,14 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"again",
"anyhow",
"app-error",
"arc-swap",
"async-trait",
+ "base64 0.22.1",
"bincode",
"brotli",
"bytes",
@@ -871,6 +906,7 @@ dependencies = [
"gotrue",
"infra",
"lazy_static",
+ "md5",
"mime",
"mime_guess",
"parking_lot 0.12.1",
@@ -901,7 +937,7 @@ dependencies = [
[[package]]
name = "client-api-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"collab-entity",
"collab-rt-entity",
@@ -914,7 +950,7 @@ dependencies = [
[[package]]
name = "client-websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"futures-channel",
"futures-util",
@@ -988,7 +1024,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -1013,7 +1049,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-trait",
@@ -1052,7 +1088,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -1073,7 +1109,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"bytes",
@@ -1093,7 +1129,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -1115,11 +1151,12 @@ dependencies = [
[[package]]
name = "collab-importer"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-recursion",
"async-trait",
+ "async_zip",
"base64 0.22.1",
"chrono",
"collab",
@@ -1129,21 +1166,23 @@ dependencies = [
"collab-folder",
"fancy-regex 0.13.0",
"futures",
+ "futures-lite",
"futures-util",
"fxhash",
"hex",
"markdown",
"percent-encoding",
"rayon",
+ "sanitize-filename",
"serde",
"serde_json",
"sha2",
"thiserror",
"tokio",
+ "tokio-util",
"tracing",
"uuid",
"walkdir",
- "zip",
]
[[package]]
@@ -1171,7 +1210,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-stream",
@@ -1209,7 +1248,7 @@ dependencies = [
[[package]]
name = "collab-rt-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bincode",
@@ -1234,7 +1273,7 @@ dependencies = [
[[package]]
name = "collab-rt-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"async-trait",
@@ -1251,7 +1290,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"collab",
@@ -1500,7 +1539,7 @@ dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa 1.0.6",
- "phf 0.11.2",
+ "phf 0.8.0",
"smallvec",
]
@@ -1625,7 +1664,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -2845,6 +2884,19 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
[[package]]
name = "futures-macro"
version = "0.3.30"
@@ -3195,7 +3247,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"futures-util",
@@ -3212,7 +3264,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -3644,7 +3696,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bytes",
@@ -4099,6 +4151,17 @@ dependencies = [
"crc",
]
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
[[package]]
name = "mac"
version = "0.1.1"
@@ -5948,6 +6011,16 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "sanitize-filename"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
[[package]]
name = "schannel"
version = "0.1.21"
@@ -6282,7 +6355,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -8639,6 +8712,15 @@ dependencies = [
"rustix",
]
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
[[package]]
name = "yrs"
version = "0.21.2"
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml
index 3a2c007528..928b034eae 100644
--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml
+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml
@@ -59,7 +59,7 @@ collab-importer = { version = "0.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 = "95e8b30f110fca0c914301da852c467a294d86dc" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "d3e4a6870d10b04e4aedac4addb17915a7acdde2" }
[dependencies]
serde_json.workspace = true
@@ -120,14 +120,14 @@ 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 = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
# 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.lock
index c96b7444e7..2a92096c43 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=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
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=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bytes",
@@ -301,6 +301,24 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+[[package]]
+name = "async-compression"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
+dependencies = [
+ "bzip2",
+ "deflate64",
+ "flate2",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "pin-project-lite",
+ "xz2",
+ "zstd",
+ "zstd-safe",
+]
+
[[package]]
name = "async-lock"
version = "3.4.0"
@@ -356,6 +374,22 @@ dependencies = [
"syn 2.0.55",
]
+[[package]]
+name = "async_zip"
+version = "0.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52"
+dependencies = [
+ "async-compression",
+ "chrono",
+ "crc32fast",
+ "futures-lite",
+ "pin-project",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+]
+
[[package]]
name = "atk"
version = "0.15.1"
@@ -837,13 +871,14 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"again",
"anyhow",
"app-error",
"arc-swap",
"async-trait",
+ "base64 0.22.1",
"bincode",
"brotli",
"bytes",
@@ -860,6 +895,7 @@ dependencies = [
"gotrue",
"infra",
"lazy_static",
+ "md5",
"mime",
"mime_guess",
"parking_lot 0.12.1",
@@ -890,7 +926,7 @@ dependencies = [
[[package]]
name = "client-api-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"collab-entity",
"collab-rt-entity",
@@ -903,7 +939,7 @@ dependencies = [
[[package]]
name = "client-websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"futures-channel",
"futures-util",
@@ -986,7 +1022,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -1011,7 +1047,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-trait",
@@ -1050,7 +1086,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -1071,7 +1107,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"bytes",
@@ -1091,7 +1127,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -1113,11 +1149,12 @@ dependencies = [
[[package]]
name = "collab-importer"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-recursion",
"async-trait",
+ "async_zip",
"base64 0.22.1",
"chrono",
"collab",
@@ -1127,21 +1164,23 @@ dependencies = [
"collab-folder",
"fancy-regex 0.13.0",
"futures",
+ "futures-lite",
"futures-util",
"fxhash",
"hex",
"markdown",
"percent-encoding",
"rayon",
+ "sanitize-filename",
"serde",
"serde_json",
"sha2",
"thiserror",
"tokio",
+ "tokio-util",
"tracing",
"uuid",
"walkdir",
- "zip",
]
[[package]]
@@ -1169,7 +1208,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-stream",
@@ -1207,7 +1246,7 @@ dependencies = [
[[package]]
name = "collab-rt-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bincode",
@@ -1232,7 +1271,7 @@ dependencies = [
[[package]]
name = "collab-rt-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"async-trait",
@@ -1249,7 +1288,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"collab",
@@ -1505,7 +1544,7 @@ dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa 1.0.10",
- "phf 0.11.2",
+ "phf 0.8.0",
"smallvec",
]
@@ -1630,7 +1669,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -2917,6 +2956,19 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
[[package]]
name = "futures-macro"
version = "0.3.30"
@@ -3277,7 +3329,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"futures-util",
@@ -3294,7 +3346,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -3731,7 +3783,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bytes",
@@ -4199,6 +4251,17 @@ dependencies = [
"crc",
]
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
[[package]]
name = "mac"
version = "0.1.1"
@@ -6025,6 +6088,16 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "sanitize-filename"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
[[package]]
name = "schannel"
version = "0.1.23"
@@ -6362,7 +6435,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -8881,6 +8954,15 @@ dependencies = [
"rustix",
]
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
[[package]]
name = "yrs"
version = "0.21.2"
diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml
index 7c6887a64d..ca4e33d5c1 100644
--- a/frontend/appflowy_web_app/src-tauri/Cargo.toml
+++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml
@@ -58,7 +58,7 @@ collab-importer = { version = "0.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 = "95e8b30f110fca0c914301da852c467a294d86dc" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "d3e4a6870d10b04e4aedac4addb17915a7acdde2" }
[dependencies]
serde_json.workspace = true
@@ -118,14 +118,14 @@ 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 = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
# Working directory: frontend
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index 42848b7a05..727d80dfb7 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=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
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=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bytes",
@@ -265,6 +265,24 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "async-compression"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
+dependencies = [
+ "bzip2",
+ "deflate64",
+ "flate2",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "pin-project-lite",
+ "xz2",
+ "zstd",
+ "zstd-safe",
+]
+
[[package]]
name = "async-lock"
version = "3.4.0"
@@ -320,6 +338,22 @@ dependencies = [
"syn 2.0.47",
]
+[[package]]
+name = "async_zip"
+version = "0.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52"
+dependencies = [
+ "async-compression",
+ "chrono",
+ "crc32fast",
+ "futures-lite",
+ "pin-project",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+]
+
[[package]]
name = "atomic"
version = "0.5.3"
@@ -740,13 +774,14 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"again",
"anyhow",
"app-error",
"arc-swap",
"async-trait",
+ "base64 0.22.1",
"bincode",
"brotli",
"bytes",
@@ -763,6 +798,7 @@ dependencies = [
"gotrue",
"infra",
"lazy_static",
+ "md5",
"mime",
"mime_guess",
"parking_lot 0.12.1",
@@ -793,7 +829,7 @@ dependencies = [
[[package]]
name = "client-api-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"collab-entity",
"collab-rt-entity",
@@ -806,7 +842,7 @@ dependencies = [
[[package]]
name = "client-websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"futures-channel",
"futures-util",
@@ -849,7 +885,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -874,7 +910,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-trait",
@@ -913,7 +949,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -934,7 +970,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"bytes",
@@ -954,7 +990,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"arc-swap",
@@ -976,11 +1012,12 @@ dependencies = [
[[package]]
name = "collab-importer"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-recursion",
"async-trait",
+ "async_zip",
"base64 0.22.1",
"chrono",
"collab",
@@ -990,21 +1027,23 @@ dependencies = [
"collab-folder",
"fancy-regex 0.13.0",
"futures",
+ "futures-lite",
"futures-util",
"fxhash",
"hex",
"markdown",
"percent-encoding",
"rayon",
+ "sanitize-filename",
"serde",
"serde_json",
"sha2",
"thiserror",
"tokio",
+ "tokio-util",
"tracing",
"uuid",
"walkdir",
- "zip",
]
[[package]]
@@ -1032,7 +1071,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"async-stream",
@@ -1070,7 +1109,7 @@ dependencies = [
[[package]]
name = "collab-rt-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bincode",
@@ -1095,7 +1134,7 @@ dependencies = [
[[package]]
name = "collab-rt-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"async-trait",
@@ -1112,7 +1151,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=8987e035accc81bd5ca0acc9812da8e4c6023eba#8987e035accc81bd5ca0acc9812da8e4c6023eba"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa#833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa"
dependencies = [
"anyhow",
"collab",
@@ -1484,7 +1523,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -2731,6 +2770,19 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
[[package]]
name = "futures-macro"
version = "0.3.30"
@@ -2909,7 +2961,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"futures-util",
@@ -2926,7 +2978,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -3288,7 +3340,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"bytes",
@@ -3634,6 +3686,17 @@ dependencies = [
"crc",
]
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
[[package]]
name = "mac"
version = "0.1.1"
@@ -5280,6 +5343,16 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "sanitize-filename"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
[[package]]
name = "schannel"
version = "0.1.22"
@@ -5544,7 +5617,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=95e8b30f110fca0c914301da852c467a294d86dc#95e8b30f110fca0c914301da852c467a294d86dc"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=d3e4a6870d10b04e4aedac4addb17915a7acdde2#d3e4a6870d10b04e4aedac4addb17915a7acdde2"
dependencies = [
"anyhow",
"app-error",
@@ -7274,6 +7347,15 @@ dependencies = [
"rustix",
]
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
[[package]]
name = "yrs"
version = "0.21.2"
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index bd408bef0f..62ee088a27 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -106,8 +106,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 = "95e8b30f110fca0c914301da852c467a294d86dc" }
-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "95e8b30f110fca0c914301da852c467a294d86dc" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "d3e4a6870d10b04e4aedac4addb17915a7acdde2" }
+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "d3e4a6870d10b04e4aedac4addb17915a7acdde2" }
[profile.dev]
opt-level = 0
@@ -142,14 +142,14 @@ 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 = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
-collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "8987e035accc81bd5ca0acc9812da8e4c6023eba" }
+collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
+collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "833a7c0b6208ef2e9d7b31650b6f2c20f0b9d8fa" }
# Working directory: frontend
# To update the commit ID, run: