Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Collab wasm build (#4297)

Browse Source 
* fix: ci

* fix: ci

* fix: build

* chore: bump collab
This commit is contained in:
Nathan.fooo
2024-01-05 00:05:38 +08:00
committed by GitHub
parent eac878d563
commit 5a87229fe9
35 changed files with 308 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/rust-lib/flowy-database2/src/manager.rs
View File

@ -4,7 +4,7 @@ use std::sync::{Arc, Weak};
use collab::core::collab::{CollabDocState, MutexCollab};
use collab_database::blocks::BlockEvent;
use collab_database::database::{DatabaseData, MutexDatabase, YrsDocAction};
use collab_database::database::{DatabaseData, MutexDatabase};
use collab_database::error::DatabaseError;
use collab_database::user::{
CollabDocStateByOid, CollabFuture, DatabaseCollabService, WorkspaceDatabase,
@ -17,7 +17,7 @@ use tokio::sync::{Mutex, RwLock};
use tracing::{event, instrument, trace};
use collab_integrate::collab_builder::{AppFlowyCollabBuilder, CollabBuilderConfig};
use collab_integrate::{CollabPersistenceConfig, RocksCollabDB};
use collab_integrate::{CollabKVAction, CollabKVDB, CollabPersistenceConfig};
use flowy_database_deps::cloud::DatabaseCloudService;
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_task::TaskDispatcher;
@ -36,7 +36,7 @@ use crate::services::share::csv::{CSVFormat, CSVImporter, ImportResult};
pub trait DatabaseUser: Send + Sync {
fn user_id(&self) -> Result<i64, FlowyError>;
fn token(&self) -> Result<Option<String>, FlowyError>;
fn collab_db(&self, uid: i64) -> Result<Weak<RocksCollabDB>, FlowyError>;
fn collab_db(&self, uid: i64) -> Result<Weak<CollabKVDB>, FlowyError>;
}
pub struct DatabaseManager {
@ -66,7 +66,7 @@ impl DatabaseManager {
}
}
fn is_collab_exist(&self, uid: i64, collab_db: &Weak<RocksCollabDB>, object_id: &str) -> bool {
fn is_collab_exist(&self, uid: i64, collab_db: &Weak<CollabKVDB>, object_id: &str) -> bool {
match collab_db.upgrade() {
None => false,
Some(collab_db) => {
@ -459,7 +459,7 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {
uid: i64,
object_id: &str,
object_type: CollabType,
collab_db: Weak<RocksCollabDB>,
collab_db: Weak<CollabKVDB>,
collab_raw_data: CollabDocState,
config: &CollabPersistenceConfig,
) -> Arc<MutexCollab> {