chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update collab commit id (#71)

This commit is contained in:
Nathan.fooo 2023-09-22 23:00:36 +08:00 committed by GitHub
parent b0622efe08
commit cbae9493b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -855,7 +855,7 @@ dependencies = [
[[package]] [[package]]
name = "collab" name = "collab"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -874,7 +874,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-define" name = "collab-define"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"collab", "collab",
@ -886,7 +886,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-plugins" name = "collab-plugins"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -913,7 +913,7 @@ dependencies = [
[[package]] [[package]]
name = "collab-sync-protocol" name = "collab-sync-protocol"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05"
dependencies = [ dependencies = [
"bytes", "bytes",
"collab", "collab",

8
Cargo.toml
View File

@ -121,10 +121,10 @@ lto = false
opt-level = 3 opt-level = 3
[patch.crates-io] [patch.crates-io]
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" }
collab-sync-protocol = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } collab-sync-protocol = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" }
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" }
collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" }
# Comment the above and uncomment the below to use local version of collab by cloning the repo and placing it in libs folder # Comment the above and uncomment the below to use local version of collab by cloning the repo and placing it in libs folder
#collab = { path = "libs/AppFlowy-Collab/collab" } #collab = { path = "libs/AppFlowy-Collab/collab" }

2
libs/realtime/src/collaborate/broadcast.rs
View File

@ -177,7 +177,7 @@ impl CollabBroadcast {
} }
tracing::debug!("[💭Server]: {}", collab_msg,); tracing::debug!("[💭Server]: {}", collab_msg,);
let payload = collab_msg.payload().unwrap(); let payload = collab_msg.payload().unwrap();
let mut decoder = DecoderV1::from(payload.as_ref()); let mut decoder = DecoderV1::from(payload);
let mut sink = sink.lock().await; let mut sink = sink.lock().await;
let reader = MessageReader::new(&mut decoder); let reader = MessageReader::new(&mut decoder);
for msg in reader { for msg in reader {

2
tests/realtime/test_client.rs
View File

@ -71,7 +71,7 @@ impl TestClient {
let origin = CollabOrigin::Client(CollabClient::new(uid, device_id.clone())); let origin = CollabOrigin::Client(CollabClient::new(uid, device_id.clone()));
let collab = Arc::new(MutexCollab::new(origin.clone(), object_id, vec![])); let collab = Arc::new(MutexCollab::new(origin.clone(), object_id, vec![]));
let object = SyncObject::new(object_id, &workspace_id, collab_type); let object = SyncObject::new(object_id, &workspace_id, collab_type, &device_id);
let sync_plugin = SyncPlugin::new( let sync_plugin = SyncPlugin::new(
origin.clone(), origin.clone(),
object, object,