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
feat: migrate user data to cloud (#3078)
Nathan.fooo2cd88594e80c
diff --git a/frontend/appflowy_flutter/lib/core/network_monitor.dart b/frontend/appflowy_flutter/lib/core/network_monitor.dartindex 1aee637176..a7294736aa 100644--- a/frontend/appflowy_flutter/lib/core/network_monitor.dart+++ b/frontend/appflowy_flutter/lib/core/network_monitor.dart@@ -1,9 +1,9 @@import 'dart:async';+import 'package:appflowy_backend/protobuf/flowy-user/user_setting.pb.dart';import 'package:connectivity_plus/connectivity_plus.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';-import 'package:appflowy_backend/protobuf/flowy-net/network_state.pb.dart';import 'package:flutter/services.dart';class NetworkListener {@@ -46,12 +46,12 @@ class NetworkListener {return NetworkTypePB.VPN;case ConnectivityResult.none:case ConnectivityResult.other:- return NetworkTypePB.Unknown;+ return NetworkTypePB.NetworkUnknown;}}();Log.info("Network type: $networkType");final state = NetworkStatePB.create()..ty = networkType;- NetworkEventUpdateNetworkType(state).send().then((result) {+ UserEventUpdateNetworkState(state).send().then((result) {result.fold((l) {},(e) => Log.error(e),diff --git a/frontend/appflowy_flutter/lib/env/env.dart b/frontend/appflowy_flutter/lib/env/env.dartindex cfcc2668f9..3714e9b5f5 100644--- a/frontend/appflowy_flutter/lib/env/env.dart+++ b/frontend/appflowy_flutter/lib/env/env.dart@@ -28,53 +28,13 @@ abstract class Env {defaultValue: '',)static final String supabaseAnonKey = _Env.supabaseAnonKey;- @EnviedField(- obfuscate: true,- varName: 'SUPABASE_KEY',- defaultValue: '',- )- static final String supabaseKey = _Env.supabaseKey;+@EnviedField(obfuscate: true,varName: 'SUPABASE_JWT_SECRET',defaultValue: '',)static final String supabaseJwtSecret = _Env.supabaseJwtSecret;-- @EnviedField(- obfuscate: true,- varName: 'SUPABASE_DB',- defaultValue: '',- )- static final String supabaseDb = _Env.supabaseDb;-- @EnviedField(- obfuscate: true,- varName: 'SUPABASE_DB_USER',- defaultValue: '',- )- static final String supabaseDbUser = _Env.supabaseDbUser;-- @EnviedField(- obfuscate: true,- varName: 'SUPABASE_DB_PASSWORD',- defaultValue: '',- )- static final String supabaseDbPassword = _Env.supabaseDbPassword;-- @EnviedField(- obfuscate: true,- varName: 'SUPABASE_DB_PORT',- defaultValue: '5432',- )- static final String supabaseDbPort = _Env.supabaseDbPort;-- @EnviedField(- obfuscate: true,- varName: 'ENABLE_SUPABASE_SYNC',- defaultValue: true,- )- static final bool enableSupabaseSync = _Env.enableSupabaseSync;}bool get isSupabaseEnable => false;diff --git a/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart b/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dartindex 2630068a39..81c8a90c42 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart@@ -30,19 +30,11 @@ class InitRustSDKTask extends LaunchTask {}AppFlowyEnv getAppFlowyEnv() {- final postgresConfig = PostgresConfiguration(- url: Env.supabaseDb,- password: Env.supabaseDbPassword,- port: int.parse(Env.supabaseDbPort),- user_name: Env.supabaseDbUser,- );-final supabaseConfig = SupabaseConfiguration(- enable_sync: Env.enableSupabaseSync,+ enable_sync: true,url: Env.supabaseUrl,- key: Env.supabaseKey,+ anon_key: Env.supabaseAnonKey,jwt_secret: Env.supabaseJwtSecret,- postgres_config: postgresConfig,);return AppFlowyEnv(diff --git a/frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart b/frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dartindex e982194e08..f53c15e4f6 100644--- a/frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart+++ b/frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart@@ -145,10 +145,9 @@ class SupabaseAuthService implements AuthService {Future<void> signOut({AuthTypePB authType = AuthTypePB.Supabase,}) async {- if (!isSupabaseEnable) {- return _appFlowyAuthService.signOut();+ if (isSupabaseEnable) {+ await _auth.signOut();}- await _auth.signOut();await _appFlowyAuthService.signOut(authType: authType,);diff --git a/frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dart b/frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dartindex a95530a5c0..c6a99318dc 100644--- a/frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dart+++ b/frontend/appflowy_flutter/lib/user/application/sign_in_bloc.dart@@ -125,7 +125,7 @@ class SignInBloc extends Bloc<SignInEvent, SignInState> {}SignInState stateFromCode(FlowyError error) {- switch (ErrorCode.valueOf(error.code)!) {+ switch (ErrorCode.valueOf(error.code)) {case ErrorCode.EmailFormatInvalid:return state.copyWith(isSubmitting: false,diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dartindex 65182ce873..f3abcb7874 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu_user.dart@@ -1,4 +1,5 @@import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';+import 'package:appflowy/startup/entry_point.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/util/color_generator/color_generator.dart';import 'package:appflowy/workspace/application/menu/menu_user_bloc.dart';@@ -87,7 +88,8 @@ class MenuUser extends StatelessWidget {}Widget _renderUserName(BuildContext context) {- final String name = userName(context.read<MenuUserBloc>().state.userProfile);+ final String name =+ userName(context.read<MenuUserBloc>().state.userProfile);return FlowyText.medium(name,overflow: TextOverflow.ellipsis,@@ -106,7 +108,17 @@ class MenuUser extends StatelessWidget {builder: (context) {return BlocProvider<DocumentAppearanceCubit>.value(value: BlocProvider.of<DocumentAppearanceCubit>(context),- child: SettingsDialog(userProfile),+ child: SettingsDialog(+ userProfile,+ didLogout: () async {+ Navigator.of(context).pop();+ await FlowyRunner.run(+ FlowyApp(),+ integrationEnv(),+ );+ },+ dismissDialog: () => Navigator.of(context).pop(),+ ),);},);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dartindex 52da257151..26aedf783d 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart@@ -18,8 +18,15 @@ const _dialogHorizontalPadding = EdgeInsets.symmetric(horizontal: 12);const _contentInsetPadding = EdgeInsets.fromLTRB(0.0, 12.0, 0.0, 16.0);class SettingsDialog extends StatelessWidget {+ final VoidCallback dismissDialog;+ final VoidCallback didLogout;final UserProfilePB user;- SettingsDialog(this.user, {Key? key}) : super(key: ValueKey(user.id));+ SettingsDialog(+ this.user, {+ required this.dismissDialog,+ required this.didLogout,+ Key? key,+ }) : super(key: ValueKey(user.id));@overrideWidget build(BuildContext context) {@@ -86,7 +93,11 @@ class SettingsDialog extends StatelessWidget {case SettingsPage.files:return const SettingsFileSystemView();case SettingsPage.user:- return SettingsUserView(user);+ return SettingsUserView(+ user,+ didLogin: () => dismissDialog(),+ didLogout: didLogout,+ );case SettingsPage.supabaseSetting:return const SupabaseSettingView();case SettingsPage.shortcuts:diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dartindex 3a1e59cfa8..4e24e072fa 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart@@ -1,3 +1,5 @@+import 'package:appflowy/startup/entry_point.dart';+import 'package:appflowy/startup/launch_configuration.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/sign_in_bloc.dart';import 'package:appflowy/user/presentation/sign_in_screen.dart';@@ -9,7 +11,8 @@ import 'package:flutter/widgets.dart';import 'package:flutter_bloc/flutter_bloc.dart';class SettingThirdPartyLogin extends StatelessWidget {- const SettingThirdPartyLogin({super.key});+ final VoidCallback didLogin;+ const SettingThirdPartyLogin({required this.didLogin, super.key});@overrideWidget build(BuildContext context) {@@ -27,13 +30,20 @@ class SettingThirdPartyLogin extends StatelessWidget {);}- void _handleSuccessOrFail(+ Future<void> _handleSuccessOrFail(Either<UserProfilePB, FlowyError> result,BuildContext context,- ) {+ ) async {result.fold(- (user) {- // TODO(Lucas): push to home screen+ (user) async {+ didLogin();+ await FlowyRunner.run(+ FlowyApp(),+ integrationEnv(),+ config: const LaunchConfiguration(+ autoRegistrationSupported: true,+ ),+ );},(error) => showSnapBar(context, error.msg),);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dartindex bbc11ad727..42283ad3a8 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_user_view.dart@@ -3,11 +3,11 @@ import 'dart:async';import 'package:appflowy/env/env.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/startup/entry_point.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/auth/auth_service.dart';import 'package:appflowy/util/debounce.dart';import 'package:appflowy/workspace/application/user/settings_user_bloc.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/image.dart';@@ -22,8 +22,15 @@ const defaultUserAvatar = '1F600';const _iconSize = Size(60, 60);class SettingsUserView extends StatelessWidget {+ final VoidCallback didLogin;+ final VoidCallback didLogout;final UserProfilePB user;- SettingsUserView(this.user, {Key? key}) : super(key: ValueKey(user.id));+ SettingsUserView(+ this.user, {+ required this.didLogin,+ required this.didLogout,+ Key? key,+ }) : super(key: ValueKey(user.id));@overrideWidget build(BuildContext context) {@@ -58,7 +65,9 @@ class SettingsUserView extends StatelessWidget {}if (state.userProfile.authType == AuthTypePB.Local) {- return const SettingThirdPartyLogin();+ return SettingThirdPartyLogin(+ didLogin: didLogin,+ );} else {return _renderLogoutButton(context);}@@ -88,15 +97,17 @@ class SettingsUserView extends StatelessWidget {Widget _renderLogoutButton(BuildContext context) {return FlowyButton(useIntrinsicWidth: true,- text: const FlowyText(- 'Logout',+ text: FlowyText(+ LocaleKeys.settings_menu_logout.tr(),),onTap: () async {- await getIt<AuthService>().signOut();- await FlowyRunner.run(- FlowyApp(),- integrationEnv(),- );+ NavigatorAlertDialog(+ title: LocaleKeys.settings_menu_logoutPrompt.tr(),+ confirm: () async {+ await getIt<AuthService>().signOut();+ didLogout();+ },+ ).show(context);},);}diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dartindex 4f911e42e2..8f782e3dc9 100644--- a/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dart+++ b/frontend/appflowy_flutter/packages/appflowy_backend/lib/dispatch/dispatch.dart@@ -4,7 +4,6 @@ import 'package:appflowy_backend/log.dart';// ignore: unnecessary_importimport 'package:appflowy_backend/protobuf/dart-ffi/ffi_response.pb.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-net/network_state.pb.dart';import 'package:isolates/isolates.dart';import 'package:isolates/ports.dart';import 'package:ffi/ffi.dart';@@ -23,11 +22,9 @@ import 'package:protobuf/protobuf.dart';import 'dart:convert' show utf8;import '../protobuf/flowy-config/entities.pb.dart';import '../protobuf/flowy-config/event_map.pb.dart';-import '../protobuf/flowy-net/event_map.pb.dart';import 'error.dart';part 'dart_event/flowy-folder2/dart_event.dart';-part 'dart_event/flowy-net/dart_event.dart';part 'dart_event/flowy-user/dart_event.dart';part 'dart_event/flowy-database2/dart_event.dart';part 'dart_event/flowy-document2/dart_event.dart';diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.dartindex 7081177224..1fc6077a3a 100644--- a/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.dart+++ b/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.dart@@ -26,16 +26,14 @@ class SupabaseConfiguration {/// Indicates whether the sync feature is enabled.final bool enable_sync;final String url;- final String key;+ final String anon_key;final String jwt_secret;- final PostgresConfiguration postgres_config;SupabaseConfiguration({this.enable_sync = true,required this.url,- required this.key,+ required this.anon_key,required this.jwt_secret,- required this.postgres_config,});factory SupabaseConfiguration.fromJson(Map<String, dynamic> json) =>@@ -43,23 +41,3 @@ class SupabaseConfiguration {Map<String, dynamic> toJson() => _$SupabaseConfigurationToJson(this);}--@JsonSerializable()-class PostgresConfiguration {- final String url;- final String user_name;- final String password;- final int port;-- PostgresConfiguration({- required this.url,- required this.user_name,- required this.password,- required this.port,- });-- factory PostgresConfiguration.fromJson(Map<String, dynamic> json) =>- _$PostgresConfigurationFromJson(json);-- Map<String, dynamic> toJson() => _$PostgresConfigurationToJson(this);-}diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.i.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.i.dartindex 4dcae3b5bc..892275ed1d 100644--- a/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.i.dart+++ b/frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.i.dart@@ -21,10 +21,8 @@ SupabaseConfiguration _$SupabaseConfigurationFromJson(SupabaseConfiguration(enable_sync: json['enable_sync'] as bool? ?? true,url: json['url'] as String,- key: json['key'] as String,+ anon_key: json['anon_key'] as String,jwt_secret: json['jwt_secret'] as String,- postgres_config: PostgresConfiguration.fromJson(- json['postgres_config'] as Map<String, dynamic>),);Map<String, dynamic> _$SupabaseConfigurationToJson(@@ -32,25 +30,6 @@ Map<String, dynamic> _$SupabaseConfigurationToJson(<String, dynamic>{'enable_sync': instance.enable_sync,'url': instance.url,- 'key': instance.key,+ 'anon_key': instance.anon_key,'jwt_secret': instance.jwt_secret,- 'postgres_config': instance.postgres_config,- };--PostgresConfiguration _$PostgresConfigurationFromJson(- Map<String, dynamic> json) =>- PostgresConfiguration(- url: json['url'] as String,- user_name: json['user_name'] as String,- password: json['password'] as String,- port: json['port'] as int,- );--Map<String, dynamic> _$PostgresConfigurationToJson(- PostgresConfiguration instance) =>- <String, dynamic>{- 'url': instance.url,- 'user_name': instance.user_name,- 'password': instance.password,- 'port': instance.port,};diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex c3cc118263..430230f541 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -105,7 +105,7 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"[[package]]name = "appflowy-integrate"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","collab",@@ -642,15 +642,6 @@ version = "0.1.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"-[[package]]-name = "block-buffer"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"-dependencies = [- "generic-array",-]-[[package]]name = "block-buffer"version = "0.10.4"@@ -1030,7 +1021,7 @@ dependencies = [[[package]]name = "collab"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","bytes",@@ -1048,7 +1039,7 @@ dependencies = [[[package]]name = "collab-client-ws"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["bytes","collab-sync",@@ -1059,14 +1050,14 @@ dependencies = ["tokio","tokio-retry","tokio-stream",- "tokio-tungstenite 0.18.0",+ "tokio-tungstenite","tracing",][[package]]name = "collab-database"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","async-trait",@@ -1093,7 +1084,7 @@ dependencies = [[[package]]name = "collab-derive"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["proc-macro2","quote",@@ -1105,7 +1096,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","collab",@@ -1124,7 +1115,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","chrono",@@ -1144,7 +1135,7 @@ dependencies = [[[package]]name = "collab-persistence"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["bincode","chrono",@@ -1164,30 +1155,26 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","async-trait","aws-config","aws-credential-types","aws-sdk-dynamodb",- "base64 0.21.2","collab","collab-client-ws","collab-persistence","collab-sync","futures-util","parking_lot 0.12.1",- "postgrest","rand 0.8.5",- "refinery","rusoto_credential","serde","serde_json","similar 2.2.1","thiserror","tokio",- "tokio-postgres","tokio-retry","tokio-stream","tracing",@@ -1198,7 +1185,7 @@ dependencies = [[[package]]name = "collab-sync"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["bytes","collab",@@ -1483,40 +1470,6 @@ dependencies = ["parking_lot_core 0.9.8",]-[[package]]-name = "deadpool"-version = "0.9.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e"-dependencies = [- "async-trait",- "deadpool-runtime",- "num_cpus",- "retain_mut",- "tokio",-]--[[package]]-name = "deadpool-postgres"-version = "0.10.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "836a24a9d49deefe610b8b60c767a7412e9a931d79a89415cd2d2d71630ca8d7"-dependencies = [- "deadpool",- "log",- "tokio",- "tokio-postgres",-]--[[package]]-name = "deadpool-runtime"-version = "0.1.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1"-dependencies = [- "tokio",-]-[[package]]name = "derivative"version = "2.2.0"@@ -1579,22 +1532,13 @@ dependencies = ["migrations_macros",]-[[package]]-name = "digest"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"-dependencies = [- "generic-array",-]-[[package]]name = "digest"version = "0.10.7"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"dependencies = [- "block-buffer 0.10.4",+ "block-buffer","crypto-common","subtle",]@@ -1853,12 +1797,10 @@ dependencies = [name = "flowy-config"version = "0.1.0"dependencies = [- "appflowy-integrate","bytes","flowy-codegen","flowy-derive","flowy-error",- "flowy-server","flowy-sqlite","lib-dispatch","protobuf",@@ -1873,9 +1815,12 @@ dependencies = ["bytes","diesel","flowy-config",+ "flowy-database-deps","flowy-database2",+ "flowy-document-deps","flowy-document2","flowy-error",+ "flowy-folder-deps","flowy-folder2","flowy-net","flowy-server",@@ -1883,11 +1828,11 @@ dependencies = ["flowy-sqlite","flowy-task","flowy-user",+ "flowy-user-deps","futures-core","lib-dispatch","lib-infra","lib-log",- "lib-ws","parking_lot 0.12.1","serde","serde_json",@@ -1897,6 +1842,16 @@ dependencies = ["uuid",]+[[package]]+name = "flowy-database-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "collab-plugins",+ "flowy-error",+ "lib-infra",+]+[[package]]name = "flowy-database2"version = "0.1.0"@@ -1914,6 +1869,7 @@ dependencies = ["dashmap","fancy-regex 0.10.0","flowy-codegen",+ "flowy-database-deps","flowy-derive","flowy-error","flowy-notification",@@ -1954,6 +1910,16 @@ dependencies = ["walkdir",]+[[package]]+name = "flowy-document-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "collab-document",+ "flowy-error",+ "lib-infra",+]+[[package]]name = "flowy-document2"version = "0.1.0"@@ -1965,6 +1931,7 @@ dependencies = ["collab-document","flowy-codegen","flowy-derive",+ "flowy-document-deps","flowy-error","flowy-notification","futures",@@ -1976,7 +1943,6 @@ dependencies = ["protobuf","serde","serde_json",- "strum","strum_macros","tokio","tokio-stream",@@ -1995,7 +1961,6 @@ dependencies = ["flowy-codegen","flowy-derive","flowy-sqlite",- "http-error-code","lib-dispatch","protobuf","r2d2",@@ -2004,6 +1969,18 @@ dependencies = ["serde_json","serde_repr","thiserror",+ "tokio-postgres",+]++[[package]]+name = "flowy-folder-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "collab-folder",+ "flowy-error",+ "lib-infra",+ "uuid",][[package]]@@ -2018,6 +1995,7 @@ dependencies = ["flowy-codegen","flowy-derive","flowy-error",+ "flowy-folder-deps","flowy-notification","lazy_static","lib-dispatch",@@ -2025,7 +2003,6 @@ dependencies = ["nanoid","parking_lot 0.12.1","protobuf",- "strum","strum_macros","tokio","tokio-stream",@@ -2038,15 +2015,10 @@ dependencies = [name = "flowy-net"version = "0.1.0"dependencies = [- "anyhow","bytes","flowy-codegen",- "flowy-derive",- "flowy-error","lib-dispatch","protobuf",- "strum_macros",- "thiserror","tracing",]@@ -2069,36 +2041,32 @@ name = "flowy-server"version = "0.1.0"dependencies = ["anyhow",- "appflowy-integrate",- "async-stream","bytes","chrono",+ "collab","collab-document",- "collab-folder",+ "collab-plugins","config",- "deadpool-postgres",- "flowy-database2",- "flowy-document2",+ "flowy-database-deps",+ "flowy-document-deps","flowy-error",- "flowy-folder2",+ "flowy-folder-deps","flowy-server-config",- "flowy-user",+ "flowy-user-deps","futures","futures-util",+ "hex","hyper","lazy_static","lib-infra",- "nanoid","parking_lot 0.12.1","postgrest",- "refinery","reqwest","serde","serde-aux","serde_json","thiserror","tokio",- "tokio-postgres","tokio-retry","tracing","uuid",@@ -2147,7 +2115,9 @@ name = "flowy-user"version = "0.1.0"dependencies = ["appflowy-integrate",+ "base64 0.21.2","bytes",+ "chrono","collab","collab-folder","diesel",@@ -2159,6 +2129,7 @@ dependencies = ["flowy-notification","flowy-server-config","flowy-sqlite",+ "flowy-user-deps","lazy_static","lib-dispatch","lib-infra",@@ -2169,7 +2140,6 @@ dependencies = ["serde","serde_json","serde_repr",- "strum","strum_macros","tokio","tracing",@@ -2178,6 +2148,20 @@ dependencies = ["validator",]+[[package]]+name = "flowy-user-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "chrono",+ "flowy-error",+ "lib-infra",+ "serde",+ "serde_json",+ "serde_repr",+ "uuid",+]+[[package]]name = "fnv"version = "1.0.7"@@ -2737,7 +2721,7 @@ version = "0.12.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"dependencies = [- "digest 0.10.7",+ "digest",][[package]]@@ -2776,16 +2760,6 @@ dependencies = ["pin-project-lite",]-[[package]]-name = "http-error-code"-version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Server?branch=refactor/appflowy_server#1ccd296de8530760d92652dbd9f38f27178059b6"-dependencies = [- "serde",- "serde_repr",- "thiserror",-]-[[package]]name = "http-range"version = "0.1.5"@@ -3200,31 +3174,6 @@ dependencies = ["tracing-subscriber 0.2.25",]-[[package]]-name = "lib-ws"-version = "0.1.0"-dependencies = [- "bytes",- "dashmap",- "futures",- "futures-channel",- "futures-core",- "futures-util",- "lib-infra",- "log",- "parking_lot 0.12.1",- "pin-project",- "protobuf",- "serde",- "serde_json",- "serde_repr",- "strum_macros",- "tokio",- "tokio-tungstenite 0.15.0",- "tracing",- "url",-]-[[package]]name = "lib0"version = "0.16.8"@@ -3415,7 +3364,7 @@ version = "0.10.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"dependencies = [- "digest 0.10.7",+ "digest",][[package]]@@ -3704,12 +3653,6 @@ version = "1.18.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"-[[package]]-name = "opaque-debug"-version = "0.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"-[[package]]name = "open"version = "3.2.0"@@ -4167,10 +4110,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f028f05971fe20f512bcc679e2c10227e57809a3af86a7606304435bc8896cd6"dependencies = ["bytes",- "chrono","fallible-iterator","postgres-protocol",- "uuid",][[package]]@@ -4548,51 +4489,6 @@ dependencies = ["thiserror",]-[[package]]-name = "refinery"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cdb0436d0dd7bd8d4fce1e828751fa79742b08e35f27cfea7546f8a322b5ef24"-dependencies = [- "refinery-core",- "refinery-macros",-]--[[package]]-name = "refinery-core"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "19206547cd047e8f4dfa6b20c30d3ecaf24be05841b6aa0aa926a47a3d0662bb"-dependencies = [- "async-trait",- "cfg-if",- "lazy_static",- "log",- "regex",- "serde",- "siphasher",- "thiserror",- "time 0.3.22",- "tokio",- "tokio-postgres",- "toml 0.7.5",- "url",- "walkdir",-]--[[package]]-name = "refinery-macros"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d94d4b9241859ba19eaa5c04c86e782eb3aa0aae2c5868e0cfa90c856e58a174"-dependencies = [- "proc-macro2",- "quote",- "refinery-core",- "regex",- "syn 2.0.22",-]-[[package]]name = "regex"version = "1.8.4"@@ -4676,12 +4572,6 @@ dependencies = ["winreg 0.10.1",]-[[package]]-name = "retain_mut"-version = "0.1.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"-[[package]]name = "ring"version = "0.16.20"@@ -5140,19 +5030,6 @@ dependencies = ["stable_deref_trait",]-[[package]]-name = "sha-1"-version = "0.9.8"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"-dependencies = [- "block-buffer 0.9.0",- "cfg-if",- "cpufeatures",- "digest 0.9.0",- "opaque-debug",-]-[[package]]name = "sha1"version = "0.10.5"@@ -5161,7 +5038,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"dependencies = ["cfg-if","cpufeatures",- "digest 0.10.7",+ "digest",][[package]]@@ -5178,7 +5055,7 @@ checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"dependencies = ["cfg-if","cpufeatures",- "digest 0.10.7",+ "digest",][[package]]@@ -6003,19 +5880,6 @@ dependencies = ["tokio-util",]-[[package]]-name = "tokio-tungstenite"-version = "0.15.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8"-dependencies = [- "futures-util",- "log",- "pin-project",- "tokio",- "tungstenite 0.14.0",-]-[[package]]name = "tokio-tungstenite"version = "0.18.0"@@ -6025,7 +5889,7 @@ dependencies = ["futures-util","log","tokio",- "tungstenite 0.18.0",+ "tungstenite",][[package]]@@ -6251,25 +6115,6 @@ version = "0.2.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"-[[package]]-name = "tungstenite"-version = "0.14.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5"-dependencies = [- "base64 0.13.1",- "byteorder",- "bytes",- "http",- "httparse",- "log",- "rand 0.8.5",- "sha-1",- "thiserror",- "url",- "utf-8",-]-[[package]]name = "tungstenite"version = "0.18.0"diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex d8c880edb5..8df9825d0a 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -34,18 +34,20 @@ default = ["custom-protocol"]custom-protocol = ["tauri/custom-protocol"][patch.crates-io]-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }--#collab = { path = "../../../../AppFlowy-Collab/collab" }-#collab-folder = { path = "../../../../AppFlowy-Collab/collab-folder" }-#collab-document = { path = "../../../../AppFlowy-Collab/collab-document" }-#collab-database = { path = "../../../../AppFlowy-Collab/collab-database" }-#appflowy-integrate = { path = "../../../../AppFlowy-Collab/appflowy-integrate" }+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }++#collab = { path = "../../AppFlowy-Collab/collab" }+#collab-folder = { path = "../../AppFlowy-Collab/collab-folder" }+#collab-document = { path = "../../AppFlowy-Collab/collab-document" }+#collab-database = { path = "../../AppFlowy-Collab/collab-database" }+#appflowy-integrate = { path = "../../AppFlowy-Collab/appflowy-integrate" }+#collab-plugins = { path = "../../AppFlowy-Collab/collab-plugins" }diff --git a/frontend/appflowy_tauri/src/services/backend/index.ts b/frontend/appflowy_tauri/src/services/backend/index.tsindex 07a9c14cca..3db0877743 100644--- a/frontend/appflowy_tauri/src/services/backend/index.ts+++ b/frontend/appflowy_tauri/src/services/backend/index.ts@@ -2,7 +2,6 @@ export * from "./models/flowy-user";export * from "./models/flowy-database2";export * from "./models/flowy-folder2";export * from "./models/flowy-document2";-export * from "./models/flowy-net";export * from "./models/flowy-error";export * from "./models/flowy-config";diff --git a/frontend/flowy-server-config/Cargo.toml b/frontend/flowy-server-config/Cargo.tomldeleted file mode 100644index ca045c8267..0000000000--- a/frontend/flowy-server-config/Cargo.toml+++ /dev/null@@ -1,8 +0,0 @@-[package]-name = "flowy-server-config"-version = "0.1.0"-edition = "2021"--# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html--[dependencies]diff --git a/frontend/flowy-server-config/src/lib.rs b/frontend/flowy-server-config/src/lib.rsdeleted file mode 100644index 7d12d9af81..0000000000--- a/frontend/flowy-server-config/src/lib.rs+++ /dev/null@@ -1,14 +0,0 @@-pub fn add(left: usize, right: usize) -> usize {- left + right-}--#[cfg(test)]-mod tests {- use super::*;-- #[test]- fn it_works() {- let result = add(2, 2);- assert_eq!(result, 4);- }-}diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex 279ca8f1b4..18abf0c2d3 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -210,6 +210,8 @@"user": "User","files": "Files","open": "Open Settings",+ "logout": "Logout",+ "logoutPrompt": "Are you sure to logout?","supabaseSetting": "Supabase Setting"},"appearance": {diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex cdef909cfd..3ee9062726 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -85,7 +85,7 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"[[package]]name = "appflowy-integrate"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","collab",@@ -141,7 +141,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -152,7 +152,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -178,9 +178,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"[[package]]name = "aws-config"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fc00553f5f3c06ffd4510a9d576f92143618706c45ea6ff81e84ad9be9588abd"+checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9"dependencies = ["aws-credential-types","aws-http",@@ -208,9 +208,9 @@ dependencies = [[[package]]name = "aws-credential-types"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4cb57ac6088805821f78d282c0ba8aec809f11cbee10dda19a97b03ab040ccc2"+checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae"dependencies = ["aws-smithy-async","aws-smithy-types",@@ -222,9 +222,9 @@ dependencies = [[[package]]name = "aws-endpoint"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9c5f6f84a4f46f95a9bb71d9300b73cd67eb868bc43ae84f66ad34752299f4ac"+checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04"dependencies = ["aws-smithy-http","aws-smithy-types",@@ -236,9 +236,9 @@ dependencies = [[[package]]name = "aws-http"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a754683c322f7dc5167484266489fdebdcd04d26e53c162cad1f3f949f2c5671"+checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44"dependencies = ["aws-credential-types","aws-smithy-http",@@ -281,9 +281,9 @@ dependencies = [[[package]]name = "aws-sdk-sso"-version = "0.27.0"+version = "0.28.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "babfd626348836a31785775e3c08a4c345a5ab4c6e06dfd9167f2bee0e6295d6"+checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4"dependencies = ["aws-credential-types","aws-endpoint",@@ -306,9 +306,9 @@ dependencies = [[[package]]name = "aws-sdk-sts"-version = "0.27.0"+version = "0.28.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2d0fbe3c2c342bc8dfea4bb43937405a8ec06f99140a0dcb9c7b59e54dfa93a1"+checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b"dependencies = ["aws-credential-types","aws-endpoint",@@ -332,9 +332,9 @@ dependencies = [[[package]]name = "aws-sig-auth"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "84dc92a63ede3c2cbe43529cb87ffa58763520c96c6a46ca1ced80417afba845"+checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61"dependencies = ["aws-credential-types","aws-sigv4",@@ -346,9 +346,9 @@ dependencies = [[[package]]name = "aws-sigv4"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "392fefab9d6fcbd76d518eb3b1c040b84728ab50f58df0c3c53ada4bea9d327e"+checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c"dependencies = ["aws-smithy-http","form_urlencoded",@@ -365,9 +365,9 @@ dependencies = [[[package]]name = "aws-smithy-async"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ae23b9fe7a07d0919000116c4c5c0578303fbce6fc8d32efca1f7759d4c20faf"+checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880"dependencies = ["futures-util","pin-project-lite",@@ -377,9 +377,9 @@ dependencies = [[[package]]name = "aws-smithy-client"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5230d25d244a51339273b8870f0f77874cd4449fb4f8f629b21188ae10cfc0ba"+checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd"dependencies = ["aws-smithy-async","aws-smithy-http",@@ -401,9 +401,9 @@ dependencies = [[[package]]name = "aws-smithy-http"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b60e2133beb9fe6ffe0b70deca57aaeff0a35ad24a9c6fab2fd3b4f45b99fdb5"+checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28"dependencies = ["aws-smithy-types","bytes",@@ -423,9 +423,9 @@ dependencies = [[[package]]name = "aws-smithy-http-tower"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3a4d94f556c86a0dd916a5d7c39747157ea8cb909ca469703e20fee33e448b67"+checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9"dependencies = ["aws-smithy-http","aws-smithy-types",@@ -439,18 +439,18 @@ dependencies = [[[package]]name = "aws-smithy-json"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5ce3d6e6ebb00b2cce379f079ad5ec508f9bcc3a9510d9b9c1840ed1d6f8af39"+checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8"dependencies = ["aws-smithy-types",][[package]]name = "aws-smithy-query"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d58edfca32ef9bfbc1ca394599e17ea329cb52d6a07359827be74235b64b3298"+checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d"dependencies = ["aws-smithy-types","urlencoding",@@ -458,9 +458,9 @@ dependencies = [[[package]]name = "aws-smithy-types"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "58db46fc1f4f26be01ebdb821751b4e2482cd43aa2b64a0348fb89762defaffa"+checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8"dependencies = ["base64-simd","itoa",@@ -471,18 +471,18 @@ dependencies = [[[package]]name = "aws-smithy-xml"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fb557fe4995bd9ec87fb244bbb254666a971dc902a783e9da8b7711610e9664c"+checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b"dependencies = ["xmlparser",][[package]]name = "aws-types"-version = "0.55.2"+version = "0.55.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "de0869598bfe46ec44ffe17e063ed33336e59df90356ca8ff0e8da6f7c1d994b"+checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829"dependencies = ["aws-credential-types","aws-smithy-async",@@ -603,7 +603,7 @@ dependencies = ["regex","rustc-hash","shlex",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -627,15 +627,6 @@ version = "1.3.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"-[[package]]-name = "block-buffer"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"-dependencies = [- "generic-array",-]-[[package]]name = "block-buffer"version = "0.10.4"@@ -897,7 +888,7 @@ dependencies = [[[package]]name = "collab"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","bytes",@@ -915,7 +906,7 @@ dependencies = [[[package]]name = "collab-client-ws"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["bytes","collab-sync",@@ -926,14 +917,14 @@ dependencies = ["tokio","tokio-retry","tokio-stream",- "tokio-tungstenite 0.18.0",+ "tokio-tungstenite","tracing",][[package]]name = "collab-database"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","async-trait",@@ -960,7 +951,7 @@ dependencies = [[[package]]name = "collab-derive"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["proc-macro2","quote",@@ -972,7 +963,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","collab",@@ -991,7 +982,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","chrono",@@ -1011,7 +1002,7 @@ dependencies = [[[package]]name = "collab-persistence"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["bincode","chrono",@@ -1031,30 +1022,26 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["anyhow","async-trait","aws-config","aws-credential-types","aws-sdk-dynamodb",- "base64 0.21.0","collab","collab-client-ws","collab-persistence","collab-sync","futures-util","parking_lot 0.12.1",- "postgrest","rand 0.8.5",- "refinery","rusoto_credential","serde","serde_json","similar 2.2.1","thiserror","tokio",- "tokio-postgres","tokio-retry","tokio-stream","tracing",@@ -1065,7 +1052,7 @@ dependencies = [[[package]]name = "collab-sync"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=f420738#f4207385738961a9aa4ea871731de204dfee8455"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=12811d#12811d26a96330f6c1acaa8815f1d8d61ca3aa61"dependencies = ["bytes","collab",@@ -1279,7 +1266,7 @@ dependencies = ["proc-macro2","quote","scratch",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -1296,7 +1283,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -1339,40 +1326,6 @@ dependencies = ["parking_lot_core 0.9.7",]-[[package]]-name = "deadpool"-version = "0.9.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e"-dependencies = [- "async-trait",- "deadpool-runtime",- "num_cpus",- "retain_mut",- "tokio",-]--[[package]]-name = "deadpool-postgres"-version = "0.10.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "836a24a9d49deefe610b8b60c767a7412e9a931d79a89415cd2d2d71630ca8d7"-dependencies = [- "deadpool",- "log",- "tokio",- "tokio-postgres",-]--[[package]]-name = "deadpool-runtime"-version = "0.1.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1"-dependencies = [- "tokio",-]-[[package]]name = "derivative"version = "2.2.0"@@ -1422,22 +1375,13 @@ dependencies = ["migrations_macros",]-[[package]]-name = "digest"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"-dependencies = [- "generic-array",-]-[[package]]name = "digest"version = "0.10.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"dependencies = [- "block-buffer 0.10.4",+ "block-buffer","crypto-common","subtle",]@@ -1506,12 +1450,6 @@ dependencies = ["regex",]-[[package]]-name = "equivalent"-version = "1.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"-[[package]]name = "errno"version = "0.3.1"@@ -1636,7 +1574,7 @@ dependencies = ["similar 1.3.0","syn 1.0.109","tera",- "toml 0.5.11",+ "toml","walkdir",]@@ -1644,12 +1582,10 @@ dependencies = [name = "flowy-config"version = "0.1.0"dependencies = [- "appflowy-integrate","bytes","flowy-codegen","flowy-derive","flowy-error",- "flowy-server","flowy-sqlite","lib-dispatch","protobuf",@@ -1665,9 +1601,12 @@ dependencies = ["console-subscriber","diesel","flowy-config",+ "flowy-database-deps","flowy-database2",+ "flowy-document-deps","flowy-document2","flowy-error",+ "flowy-folder-deps","flowy-folder2","flowy-net","flowy-server",@@ -1675,11 +1614,11 @@ dependencies = ["flowy-sqlite","flowy-task","flowy-user",+ "flowy-user-deps","futures-core","lib-dispatch","lib-infra","lib-log",- "lib-ws","parking_lot 0.12.1","serde","serde_json",@@ -1689,6 +1628,16 @@ dependencies = ["uuid",]+[[package]]+name = "flowy-database-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "collab-plugins",+ "flowy-error",+ "lib-infra",+]+[[package]]name = "flowy-database2"version = "0.1.0"@@ -1706,13 +1655,14 @@ dependencies = ["dashmap","fancy-regex 0.10.0","flowy-codegen",+ "flowy-database-deps","flowy-derive","flowy-error","flowy-notification","flowy-task","flowy-test","futures",- "indexmap 1.9.3",+ "indexmap","lazy_static","lib-dispatch","lib-infra",@@ -1747,6 +1697,16 @@ dependencies = ["walkdir",]+[[package]]+name = "flowy-document-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "collab-document",+ "flowy-error",+ "lib-infra",+]+[[package]]name = "flowy-document2"version = "0.1.0"@@ -1758,10 +1718,11 @@ dependencies = ["collab-document","flowy-codegen","flowy-derive",+ "flowy-document-deps","flowy-error","flowy-notification","futures",- "indexmap 1.9.3",+ "indexmap","lib-dispatch","lib-infra","nanoid",@@ -1769,7 +1730,6 @@ dependencies = ["protobuf","serde","serde_json",- "strum","strum_macros","tempfile","tokio",@@ -1799,6 +1759,19 @@ dependencies = ["serde_json","serde_repr","thiserror",+ "tokio",+ "tokio-postgres",+]++[[package]]+name = "flowy-folder-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "collab-folder",+ "flowy-error",+ "lib-infra",+ "uuid",][[package]]@@ -1813,6 +1786,7 @@ dependencies = ["flowy-codegen","flowy-derive","flowy-error",+ "flowy-folder-deps","flowy-folder2","flowy-notification","flowy-test",@@ -1822,7 +1796,6 @@ dependencies = ["nanoid","parking_lot 0.12.1","protobuf",- "strum","strum_macros","tokio","tokio-stream",@@ -1835,15 +1808,10 @@ dependencies = [name = "flowy-net"version = "0.1.0"dependencies = [- "anyhow","bytes","flowy-codegen",- "flowy-derive",- "flowy-error","lib-dispatch","protobuf",- "strum_macros",- "thiserror","tracing",]@@ -1866,41 +1834,38 @@ name = "flowy-server"version = "0.1.0"dependencies = ["anyhow",- "appflowy-integrate",- "async-stream","bytes","chrono",+ "collab","collab-document",- "collab-folder",+ "collab-plugins","config",- "deadpool-postgres","dotenv",- "flowy-database2",- "flowy-document2",+ "flowy-database-deps",+ "flowy-document-deps","flowy-error",- "flowy-folder2",+ "flowy-folder-deps","flowy-server-config",- "flowy-user",+ "flowy-user-deps","futures","futures-util",+ "hex","hyper","lazy_static","lib-infra",- "nanoid","parking_lot 0.12.1","postgrest",- "refinery","reqwest","serde","serde-aux","serde_json","thiserror","tokio",- "tokio-postgres","tokio-retry","tracing","tracing-subscriber 0.3.16","uuid",+ "yrs",][[package]]@@ -1957,6 +1922,7 @@ dependencies = ["collab-database","collab-document","collab-folder",+ "collab-plugins","dotenv","flowy-core","flowy-database2",@@ -1967,10 +1933,10 @@ dependencies = ["flowy-server","flowy-server-config","flowy-user",+ "flowy-user-deps","futures-util","lib-dispatch","lib-infra",- "lib-ot","nanoid","parking_lot 0.12.1","protobuf",@@ -1989,7 +1955,9 @@ name = "flowy-user"version = "0.1.0"dependencies = ["appflowy-integrate",+ "base64 0.21.0","bytes",+ "chrono","collab","collab-folder","diesel",@@ -2002,6 +1970,7 @@ dependencies = ["flowy-notification","flowy-server-config","flowy-sqlite",+ "flowy-user-deps","lazy_static","lib-dispatch","lib-infra",@@ -2017,7 +1986,6 @@ dependencies = ["serde","serde_json","serde_repr",- "strum","strum_macros","tokio","tracing",@@ -2026,6 +1994,20 @@ dependencies = ["validator",]+[[package]]+name = "flowy-user-deps"+version = "0.1.0"+dependencies = [+ "anyhow",+ "chrono",+ "flowy-error",+ "lib-infra",+ "serde",+ "serde_json",+ "serde_repr",+ "uuid",+]+[[package]]name = "fnv"version = "1.0.7"@@ -2128,7 +2110,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -2262,7 +2244,7 @@ dependencies = ["futures-sink","futures-util","http",- "indexmap 1.9.3",+ "indexmap","slab","tokio","tokio-util",@@ -2287,12 +2269,6 @@ dependencies = ["ahash 0.8.3",]-[[package]]-name = "hashbrown"-version = "0.14.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"-[[package]]name = "hdrhistogram"version = "7.5.2"@@ -2342,7 +2318,7 @@ version = "0.12.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"dependencies = [- "digest 0.10.6",+ "digest",][[package]]@@ -2541,22 +2517,6 @@ dependencies = ["serde",]-[[package]]-name = "indexmap"-version = "2.0.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"-dependencies = [- "equivalent",- "hashbrown 0.14.0",-]--[[package]]-name = "indextree"-version = "4.6.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6"-[[package]]name = "instant"version = "0.1.12"@@ -2697,48 +2657,6 @@ dependencies = ["tracing-subscriber 0.2.25",]-[[package]]-name = "lib-ot"-version = "0.1.0"-dependencies = [- "bytes",- "indexmap 1.9.3",- "indextree",- "lazy_static",- "log",- "serde",- "serde_json",- "strum",- "strum_macros",- "thiserror",- "tracing",-]--[[package]]-name = "lib-ws"-version = "0.1.0"-dependencies = [- "bytes",- "dashmap",- "futures",- "futures-channel",- "futures-core",- "futures-util",- "lib-infra",- "log",- "parking_lot 0.12.1",- "pin-project",- "protobuf",- "serde",- "serde_json",- "serde_repr",- "strum_macros",- "tokio",- "tokio-tungstenite 0.15.0",- "tracing",- "url",-]-[[package]]name = "lib0"version = "0.16.5"@@ -2894,7 +2812,7 @@ version = "0.10.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"dependencies = [- "digest 0.10.6",+ "digest",][[package]]@@ -3074,12 +2992,6 @@ version = "1.17.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"-[[package]]-name = "opaque-debug"-version = "0.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"-[[package]]name = "openssl"version = "0.10.50"@@ -3103,7 +3015,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -3255,7 +3167,7 @@ dependencies = ["pest_meta","proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -3453,17 +3365,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f028f05971fe20f512bcc679e2c10227e57809a3af86a7606304435bc8896cd6"dependencies = ["bytes",- "chrono","fallible-iterator","postgres-protocol",- "uuid",][[package]]name = "postgrest"-version = "1.5.0"+version = "1.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e66400cb23a379592bc8c8bdc9adda652eef4a969b74ab78454a8e8c11330c2b"+checksum = "5a966c650b47a064e7082170b4be74fca08c088d893244fc4b70123e3c1f3ee7"dependencies = ["reqwest",]@@ -3481,7 +3391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "617feabb81566b593beb4886fb8c1f38064169dae4dccad0e3220160c3b37203"dependencies = ["proc-macro2",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -3490,7 +3400,7 @@ version = "0.1.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"dependencies = [- "toml 0.5.11",+ "toml",][[package]]@@ -3525,9 +3435,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"[[package]]name = "proc-macro2"-version = "1.0.56"+version = "1.0.66"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"dependencies = ["unicode-ident",]@@ -3695,9 +3605,9 @@ dependencies = [[[package]]name = "quote"-version = "1.0.26"+version = "1.0.32"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"dependencies = ["proc-macro2",]@@ -3888,51 +3798,6 @@ dependencies = ["thiserror",]-[[package]]-name = "refinery"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cdb0436d0dd7bd8d4fce1e828751fa79742b08e35f27cfea7546f8a322b5ef24"-dependencies = [- "refinery-core",- "refinery-macros",-]--[[package]]-name = "refinery-core"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "19206547cd047e8f4dfa6b20c30d3ecaf24be05841b6aa0aa926a47a3d0662bb"-dependencies = [- "async-trait",- "cfg-if",- "lazy_static",- "log",- "regex",- "serde",- "siphasher",- "thiserror",- "time 0.3.21",- "tokio",- "tokio-postgres",- "toml 0.7.5",- "url",- "walkdir",-]--[[package]]-name = "refinery-macros"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d94d4b9241859ba19eaa5c04c86e782eb3aa0aae2c5868e0cfa90c856e58a174"-dependencies = [- "proc-macro2",- "quote",- "refinery-core",- "regex",- "syn 2.0.16",-]-[[package]]name = "regex"version = "1.7.3"@@ -4019,12 +3884,6 @@ dependencies = ["winreg",]-[[package]]-name = "retain_mut"-version = "0.1.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"-[[package]]name = "ring"version = "0.16.20"@@ -4170,9 +4029,9 @@ dependencies = [[[package]]name = "rustls-native-certs"-version = "0.6.2"+version = "0.6.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"dependencies = ["openssl-probe","rustls-pemfile",@@ -4291,15 +4150,15 @@ dependencies = [[[package]]name = "semver"-version = "1.0.17"+version = "1.0.18"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"[[package]]name = "serde"-version = "1.0.160"+version = "1.0.175"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"+checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"dependencies = ["serde_derive",]@@ -4317,20 +4176,20 @@ dependencies = [[[package]]name = "serde_derive"-version = "1.0.160"+version = "1.0.175"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"+checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]name = "serde_json"-version = "1.0.96"+version = "1.0.103"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"dependencies = ["itoa","ryu",@@ -4345,16 +4204,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"dependencies = ["proc-macro2","quote",- "syn 2.0.16",-]--[[package]]-name = "serde_spanned"-version = "0.6.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"-dependencies = [- "serde",+ "syn 2.0.27",][[package]]@@ -4369,19 +4219,6 @@ dependencies = ["serde",]-[[package]]-name = "sha-1"-version = "0.9.8"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"-dependencies = [- "block-buffer 0.9.0",- "cfg-if",- "cpufeatures",- "digest 0.9.0",- "opaque-debug",-]-[[package]]name = "sha1"version = "0.10.5"@@ -4390,7 +4227,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"dependencies = ["cfg-if","cpufeatures",- "digest 0.10.6",+ "digest",][[package]]@@ -4407,7 +4244,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"dependencies = ["cfg-if","cpufeatures",- "digest 0.10.6",+ "digest",][[package]]@@ -4586,9 +4423,9 @@ dependencies = [[[package]]name = "syn"-version = "2.0.16"+version = "2.0.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"dependencies = ["proc-macro2","quote",@@ -4683,7 +4520,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -4723,7 +4560,6 @@ version = "0.3.21"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"dependencies = [- "itoa","serde","time-core","time-macros",@@ -4797,7 +4633,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"dependencies = ["proc-macro2","quote",- "syn 2.0.16",+ "syn 2.0.27",][[package]]@@ -4868,19 +4704,6 @@ dependencies = ["tokio-util",]-[[package]]-name = "tokio-tungstenite"-version = "0.15.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8"-dependencies = [- "futures-util",- "log",- "pin-project",- "tokio",- "tungstenite 0.14.0",-]-[[package]]name = "tokio-tungstenite"version = "0.18.0"@@ -4890,7 +4713,7 @@ dependencies = ["futures-util","log","tokio",- "tungstenite 0.18.0",+ "tungstenite",][[package]]@@ -4916,40 +4739,6 @@ dependencies = ["serde",]-[[package]]-name = "toml"-version = "0.7.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"-dependencies = [- "serde",- "serde_spanned",- "toml_datetime",- "toml_edit",-]--[[package]]-name = "toml_datetime"-version = "0.6.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"-dependencies = [- "serde",-]--[[package]]-name = "toml_edit"-version = "0.19.11"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"-dependencies = [- "indexmap 2.0.0",- "serde",- "serde_spanned",- "toml_datetime",- "winnow",-]-[[package]]name = "tonic"version = "0.8.3"@@ -4990,7 +4779,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"dependencies = ["futures-core","futures-util",- "indexmap 1.9.3",+ "indexmap","pin-project","pin-project-lite","rand 0.8.5",@@ -5153,25 +4942,6 @@ version = "0.2.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"-[[package]]-name = "tungstenite"-version = "0.14.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5"-dependencies = [- "base64 0.13.1",- "byteorder",- "bytes",- "http",- "httparse",- "log",- "rand 0.8.5",- "sha-1",- "thiserror",- "url",- "utf-8",-]-[[package]]name = "tungstenite"version = "0.18.0"@@ -5314,9 +5084,9 @@ dependencies = [[[package]]name = "urlencoding"-version = "2.1.2"+version = "2.1.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"[[package]]name = "utf-8"@@ -5705,15 +5475,6 @@ version = "0.48.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"-[[package]]-name = "winnow"-version = "0.4.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"-dependencies = [- "memchr",-]-[[package]]name = "winreg"version = "0.10.1"diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex 40e25e44aa..b811ec78fc 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -6,13 +6,17 @@ members = ["flowy-core","dart-ffi","flowy-user",+ "flowy-user-deps","flowy-test","flowy-sqlite","flowy-folder2",+ "flowy-folder-deps","flowy-notification","flowy-document2",+ "flowy-document-deps","flowy-error","flowy-database2",+ "flowy-database-deps","flowy-task","flowy-server","flowy-server-config",@@ -34,15 +38,17 @@ opt-level = 3incremental = false[patch.crates-io]-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }-appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "f420738" }+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+appflowy-integrate = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5783a5" }-#collab = { path = "../../../AppFlowy-Collab/collab" }-#collab-folder = { path = "../../../AppFlowy-Collab/collab-folder" }-#collab-database= { path = "../../../AppFlowy-Collab/collab-database" }-#collab-document = { path = "../../../AppFlowy-Collab/collab-document" }-#appflowy-integrate = { path = "../../../AppFlowy-Collab/appflowy-integrate" }+#collab = { path = "../AppFlowy-Collab/collab" }+#collab-folder = { path = "../AppFlowy-Collab/collab-folder" }+#collab-database= { path = "../AppFlowy-Collab/collab-database" }+#collab-document = { path = "../AppFlowy-Collab/collab-document" }+#collab-plugins = { path = "../AppFlowy-Collab/collab-plugins" }+#appflowy-integrate = { path = "../AppFlowy-Collab/appflowy-integrate" }diff --git a/frontend/rust-lib/flowy-config/Cargo.toml b/frontend/rust-lib/flowy-config/Cargo.tomlindex 0725e7363e..6f425568f5 100644--- a/frontend/rust-lib/flowy-config/Cargo.toml+++ b/frontend/rust-lib/flowy-config/Cargo.toml@@ -13,8 +13,6 @@ protobuf = {version = "2.28.0"}bytes = { version = "1.4" }flowy-error = { path = "../flowy-error" }strum_macros = "0.21"-appflowy-integrate = {version = "0.1.0" }-flowy-server = { path = "../flowy-server" }[build-dependencies]flowy-codegen = { path = "../../../shared-lib/flowy-codegen"}diff --git a/frontend/rust-lib/flowy-config/src/entities.rs b/frontend/rust-lib/flowy-config/src/entities.rsindex c4791b35aa..931724d542 100644--- a/frontend/rust-lib/flowy-config/src/entities.rs+++ b/frontend/rust-lib/flowy-config/src/entities.rs@@ -1,7 +1,4 @@-use appflowy_integrate::config::AWSDynamoDBConfig;-use flowy_derive::ProtoBuf;-use flowy_error::FlowyError;#[derive(Default, ProtoBuf)]pub struct KeyValuePB {@@ -17,34 +14,3 @@ pub struct KeyPB {#[pb(index = 1)]pub key: String,}--#[derive(Default, ProtoBuf)]-pub struct CollabPluginConfigPB {- #[pb(index = 1, one_of)]- pub aws_config: Option<AWSDynamoDBConfigPB>,-}--#[derive(Default, ProtoBuf)]-pub struct AWSDynamoDBConfigPB {- #[pb(index = 1)]- pub access_key_id: String,-- #[pb(index = 2)]- pub secret_access_key: String,- // Region list: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html- #[pb(index = 3)]- pub region: String,-}--impl TryFrom<AWSDynamoDBConfigPB> for AWSDynamoDBConfig {- type Error = FlowyError;-- fn try_from(config: AWSDynamoDBConfigPB) -> Result<Self, Self::Error> {- Ok(AWSDynamoDBConfig {- access_key_id: config.access_key_id,- secret_access_key: config.secret_access_key,- region: config.region,- enable: true,- })- }-}diff --git a/frontend/rust-lib/flowy-config/src/event_handler.rs b/frontend/rust-lib/flowy-config/src/event_handler.rsindex 1b9d713f3a..a759a9e10e 100644--- a/frontend/rust-lib/flowy-config/src/event_handler.rs+++ b/frontend/rust-lib/flowy-config/src/event_handler.rs@@ -1,10 +1,8 @@-use appflowy_integrate::config::AWSDynamoDBConfig;-use flowy_error::{FlowyError, FlowyResult};use flowy_sqlite::kv::KV;use lib_dispatch::prelude::{data_result_ok, AFPluginData, DataResult};-use crate::entities::{CollabPluginConfigPB, KeyPB, KeyValuePB};+use crate::entities::{KeyPB, KeyValuePB};pub(crate) async fn set_key_value_handler(data: AFPluginData<KeyValuePB>) -> FlowyResult<()> {let data = data.into_inner();@@ -33,15 +31,3 @@ pub(crate) async fn remove_key_value_handler(data: AFPluginData<KeyPB>) -> FlowyKV::remove(&data.key);Ok(())}--pub(crate) async fn set_collab_plugin_config_handler(- data: AFPluginData<CollabPluginConfigPB>,-) -> FlowyResult<()> {- let config = data.into_inner();- if let Some(aws_config_pb) = config.aws_config {- if let Ok(aws_config) = AWSDynamoDBConfig::try_from(aws_config_pb) {- aws_config.write_env();- }- }- Ok(())-}diff --git a/frontend/rust-lib/flowy-config/src/event_map.rs b/frontend/rust-lib/flowy-config/src/event_map.rsindex 933d358b8e..ae85aacda2 100644--- a/frontend/rust-lib/flowy-config/src/event_map.rs+++ b/frontend/rust-lib/flowy-config/src/event_map.rs@@ -11,10 +11,6 @@ pub fn init() -> AFPlugin {.event(ConfigEvent::SetKeyValue, set_key_value_handler).event(ConfigEvent::GetKeyValue, get_key_value_handler).event(ConfigEvent::RemoveKeyValue, remove_key_value_handler)- .event(- ConfigEvent::SetCollabPluginConfig,- set_collab_plugin_config_handler,- )}#[derive(Debug, Clone, PartialEq, Eq, Hash, Display, ProtoBuf_Enum, Flowy_Event)]@@ -28,7 +24,4 @@ pub enum ConfigEvent {#[event(input = "KeyPB")]RemoveKeyValue = 2,-- #[event(input = "CollabPluginConfigPB")]- SetCollabPluginConfig = 4,}diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.tomlindex e5254fb21a..d21859797d 100644--- a/frontend/rust-lib/flowy-core/Cargo.toml+++ b/frontend/rust-lib/flowy-core/Cargo.toml@@ -9,17 +9,21 @@ edition = "2018"lib-dispatch = { path = "../lib-dispatch" }lib-log = { path = "../lib-log" }flowy-user = { path = "../flowy-user" }+flowy-user-deps = { path = "../flowy-user-deps" }flowy-net = { path = "../flowy-net" }flowy-folder2 = { path = "../flowy-folder2" }+flowy-folder-deps = { path = "../flowy-folder-deps" }flowy-database2 = { path = "../flowy-database2" }+flowy-database-deps = { path = "../flowy-database-deps" }flowy-sqlite = { path = "../flowy-sqlite" }flowy-document2 = { path = "../flowy-document2" }+flowy-document-deps = { path = "../flowy-document-deps" }flowy-error = { path = "../flowy-error" }flowy-task = { path = "../flowy-task" }flowy-server = { path = "../flowy-server" }flowy-server-config = { path = "../flowy-server-config" }flowy-config = { path = "../flowy-config" }-appflowy-integrate = { version = "0.1.0" }+appflowy-integrate = { version = "0.1.0", features = ["postgres_storage_plugin", "snapshot_plugin"] }diesel = { version = "1.4.8", features = ["sqlite"] }uuid = { version = "1.3.3", features = ["v4"] }@@ -30,7 +34,6 @@ tokio = { version = "1.26", features = ["full"] }console-subscriber = { version = "0.1.8", optional = true }parking_lot = "0.12.1"-lib-ws = { path = "../../../shared-lib/lib-ws" }lib-infra = { path = "../../../shared-lib/lib-infra" }serde = "1.0"serde_json = "1.0"diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rsindex 5614cf21df..34fbb76c71 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/database_deps.rs@@ -4,23 +4,23 @@ use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;use appflowy_integrate::RocksCollabDB;use tokio::sync::RwLock;-use flowy_database2::deps::{DatabaseCloudService, DatabaseUser2};-use flowy_database2::DatabaseManager2;+use flowy_database2::{DatabaseManager, DatabaseUser};+use flowy_database_deps::cloud::DatabaseCloudService;use flowy_error::FlowyError;use flowy_task::TaskDispatcher;use flowy_user::services::UserSession;-pub struct Database2DepsResolver();+pub struct DatabaseDepsResolver();-impl Database2DepsResolver {+impl DatabaseDepsResolver {pub async fn resolve(user_session: Weak<UserSession>,task_scheduler: Arc<RwLock<TaskDispatcher>>,collab_builder: Arc<AppFlowyCollabBuilder>,cloud_service: Arc<dyn DatabaseCloudService>,- ) -> Arc<DatabaseManager2> {+ ) -> Arc<DatabaseManager> {let user = Arc::new(DatabaseUserImpl(user_session));- Arc::new(DatabaseManager2::new(+ Arc::new(DatabaseManager::new(user,task_scheduler,collab_builder,@@ -30,7 +30,7 @@ impl Database2DepsResolver {}struct DatabaseUserImpl(Weak<UserSession>);-impl DatabaseUser2 for DatabaseUserImpl {+impl DatabaseUser for DatabaseUserImpl {fn user_id(&self) -> Result<i64, FlowyError> {self.0@@ -47,7 +47,7 @@ impl DatabaseUser2 for DatabaseUserImpl {.token()}- fn collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError> {+ fn collab_db(&self, uid: i64) -> Result<Weak<RocksCollabDB>, FlowyError> {self.0.upgrade()diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/document2_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rssimilarity index 77%rename from frontend/rust-lib/flowy-core/src/deps_resolve/document2_deps.rsrename to frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rsindex 9c1b27638d..8269514635 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/document2_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/document_deps.rs@@ -3,17 +3,17 @@ use std::sync::{Arc, Weak};use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;use appflowy_integrate::RocksCollabDB;-use flowy_database2::DatabaseManager2;-use flowy_document2::deps::{DocumentCloudService, DocumentUser};-use flowy_document2::manager::DocumentManager;+use flowy_database2::DatabaseManager;+use flowy_document2::manager::{DocumentManager, DocumentUser};+use flowy_document_deps::cloud::DocumentCloudService;use flowy_error::FlowyError;use flowy_user::services::UserSession;-pub struct Document2DepsResolver();-impl Document2DepsResolver {+pub struct DocumentDepsResolver();+impl DocumentDepsResolver {pub fn resolve(user_session: Weak<UserSession>,- _database_manager: &Arc<DatabaseManager2>,+ _database_manager: &Arc<DatabaseManager>,collab_builder: Arc<AppFlowyCollabBuilder>,cloud_service: Arc<dyn DocumentCloudService>,) -> Arc<DocumentManager> {@@ -44,7 +44,7 @@ impl DocumentUser for DocumentUserImpl {.token()}- fn collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError> {+ fn collab_db(&self, uid: i64) -> Result<Weak<RocksCollabDB>, FlowyError> {self.0.upgrade()diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rssimilarity index 96%rename from frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rsrename to frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rsindex 00377e7764..dd48d663ca 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/folder2_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps.rs@@ -10,29 +10,29 @@ use tokio::sync::RwLock;use flowy_database2::entities::DatabaseLayoutPB;use flowy_database2::services::share::csv::CSVFormat;use flowy_database2::template::{make_default_board, make_default_calendar, make_default_grid};-use flowy_database2::DatabaseManager2;+use flowy_database2::DatabaseManager;use flowy_document2::entities::DocumentDataPB;use flowy_document2::manager::DocumentManager;use flowy_document2::parser::json::parser::JsonToDocumentParser;use flowy_error::FlowyError;-use flowy_folder2::deps::{FolderCloudService, FolderUser};use flowy_folder2::entities::ViewLayoutPB;-use flowy_folder2::manager::FolderManager;+use flowy_folder2::manager::{FolderManager, FolderUser};use flowy_folder2::share::ImportType;use flowy_folder2::view_operation::{FolderOperationHandler, FolderOperationHandlers, View, WorkspaceViewBuilder,};use flowy_folder2::ViewLayout;+use flowy_folder_deps::cloud::FolderCloudService;use flowy_user::services::UserSession;use lib_dispatch::prelude::ToBytes;use lib_infra::future::FutureResult;-pub struct Folder2DepsResolver();-impl Folder2DepsResolver {+pub struct FolderDepsResolver();+impl FolderDepsResolver {pub async fn resolve(user_session: Weak<UserSession>,document_manager: &Arc<DocumentManager>,- database_manager: &Arc<DatabaseManager2>,+ database_manager: &Arc<DatabaseManager>,collab_builder: Arc<AppFlowyCollabBuilder>,folder_cloud: Arc<dyn FolderCloudService>,) -> Arc<FolderManager> {@@ -49,7 +49,7 @@ impl Folder2DepsResolver {fn folder_operation_handlers(document_manager: Arc<DocumentManager>,- database_manager: Arc<DatabaseManager2>,+ database_manager: Arc<DatabaseManager>,) -> FolderOperationHandlers {let mut map: HashMap<ViewLayout, Arc<dyn FolderOperationHandler + Send + Sync>> = HashMap::new();@@ -81,7 +81,7 @@ impl FolderUser for FolderUserImpl {.token()}- fn collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError> {+ fn collab_db(&self, uid: i64) -> Result<Weak<RocksCollabDB>, FlowyError> {self.0.upgrade()@@ -218,7 +218,7 @@ impl FolderOperationHandler for DocumentFolderOperation {}}-struct DatabaseFolderOperation(Arc<DatabaseManager2>);+struct DatabaseFolderOperation(Arc<DatabaseManager>);impl FolderOperationHandler for DatabaseFolderOperation {fn close_view(&self, view_id: &str) -> FutureResult<(), FlowyError> {let database_manager = self.0.clone();diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rsindex d14a275def..d321086a5d 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/mod.rs@@ -1,11 +1,11 @@pub use collab_deps::*;pub use database_deps::*;-pub use document2_deps::*;-pub use folder2_deps::*;+pub use document_deps::*;+pub use folder_deps::*;mod collab_deps;-mod document2_deps;-mod folder2_deps;+mod document_deps;+mod folder_deps;mod util;mod database_deps;diff --git a/frontend/rust-lib/flowy-core/src/integrate/server.rs b/frontend/rust-lib/flowy-core/src/integrate/server.rsindex 9dea34fc87..21190e12d6 100644--- a/frontend/rust-lib/flowy-core/src/integrate/server.rs+++ b/frontend/rust-lib/flowy-core/src/integrate/server.rs@@ -2,25 +2,28 @@ use std::collections::HashMap;use std::sync::Arc;use appflowy_integrate::collab_builder::{CollabStorageProvider, CollabStorageType};-use appflowy_integrate::RemoteCollabStorage;+use appflowy_integrate::{CollabType, RemoteCollabStorage, YrsDocAction};use parking_lot::RwLock;use serde_repr::*;-use flowy_database2::deps::{- CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,-};-use flowy_document2::deps::{DocumentCloudService, DocumentData, DocumentSnapshot};+use flowy_database_deps::cloud::*;+use flowy_document2::deps::DocumentData;+use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_folder2::deps::{FolderCloudService, FolderData, FolderSnapshot, Workspace};-use flowy_server::local_server::LocalServer;+use flowy_folder_deps::cloud::*;+use flowy_server::local_server::{LocalServer, LocalServerDB};use flowy_server::self_host::configuration::self_host_server_configuration;use flowy_server::self_host::SelfHostServer;use flowy_server::supabase::SupabaseServer;use flowy_server::AppFlowyServer;use flowy_server_config::supabase_config::SupabaseConfiguration;use flowy_sqlite::kv::KV;-use flowy_user::event_map::{UserAuthService, UserCloudServiceProvider};-use flowy_user::services::AuthType;+use flowy_user::event_map::UserCloudServiceProvider;+use flowy_user::services::database::{+ get_user_profile, get_user_workspace, open_collab_db, open_user_db,+};+use flowy_user_deps::cloud::UserService;+use flowy_user_deps::entities::*;use lib_infra::future::FutureResult;use crate::AppFlowyCoreConfig;@@ -45,7 +48,7 @@ pub enum ServerProviderType {/// The [AppFlowyServerProvider] provides list of [AppFlowyServer] base on the [AuthType]. Using/// the auth type, the [AppFlowyServerProvider] will create a new [AppFlowyServer] if it doesn't/// exist.-/// Each server implements the [AppFlowyServer] trait, which provides the [UserAuthService], etc.+/// Each server implements the [AppFlowyServer] trait, which provides the [UserService], etc.pub struct AppFlowyServerProvider {config: AppFlowyCoreConfig,provider_type: RwLock<ServerProviderType>,@@ -78,7 +81,11 @@ impl AppFlowyServerProvider {let server = match provider_type {ServerProviderType::Local => {- let server = Arc::new(LocalServer::new(&self.config.storage_path));+ let local_db = Arc::new(LocalServerDBImpl {+ storage_path: self.config.storage_path.clone(),+ });+ let server = Arc::new(LocalServer::new(local_db));+Ok::<Arc<dyn AppFlowyServer>, FlowyError>(server)},ServerProviderType::SelfHosted => {@@ -142,9 +149,9 @@ impl UserCloudServiceProvider for AppFlowyServerProvider {}}- /// Returns the [UserAuthService] base on the current [ServerProviderType].+ /// Returns the [UserService] base on the current [ServerProviderType]./// Creates a new [AppFlowyServer] if it doesn't exist.- fn get_auth_service(&self) -> Result<Arc<dyn UserAuthService>, FlowyError> {+ fn get_user_service(&self) -> Result<Arc<dyn UserService>, FlowyError> {Ok(self.get_provider(&self.provider_type.read())?@@ -154,13 +161,13 @@ impl UserCloudServiceProvider for AppFlowyServerProvider {}impl FolderCloudService for AppFlowyServerProvider {- fn create_workspace(&self, uid: i64, name: &str) -> FutureResult<Workspace, FlowyError> {+ fn create_workspace(&self, uid: i64, name: &str) -> FutureResult<Workspace, Error> {let server = self.get_provider(&self.provider_type.read());let name = name.to_string();FutureResult::new(async move { server?.folder_service().create_workspace(uid, &name).await })}- fn get_folder_data(&self, workspace_id: &str) -> FutureResult<Option<FolderData>, FlowyError> {+ fn get_folder_data(&self, workspace_id: &str) -> FutureResult<Option<FolderData>, Error> {let server = self.get_provider(&self.provider_type.read());let workspace_id = workspace_id.to_string();FutureResult::new(async move {@@ -174,7 +181,7 @@ impl FolderCloudService for AppFlowyServerProvider {fn get_folder_latest_snapshot(&self,workspace_id: &str,- ) -> FutureResult<Option<FolderSnapshot>, FlowyError> {+ ) -> FutureResult<Option<FolderSnapshot>, Error> {let workspace_id = workspace_id.to_string();let server = self.get_provider(&self.provider_type.read());FutureResult::new(async move {@@ -185,11 +192,7 @@ impl FolderCloudService for AppFlowyServerProvider {})}- fn get_folder_updates(- &self,- workspace_id: &str,- uid: i64,- ) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ fn get_folder_updates(&self, workspace_id: &str, uid: i64) -> FutureResult<Vec<Vec<u8>>, Error> {let workspace_id = workspace_id.to_string();let server = self.get_provider(&self.provider_type.read());FutureResult::new(async move {@@ -209,13 +212,17 @@ impl FolderCloudService for AppFlowyServerProvider {}impl DatabaseCloudService for AppFlowyServerProvider {- fn get_collab_update(&self, object_id: &str) -> FutureResult<CollabObjectUpdate, FlowyError> {+ fn get_collab_update(+ &self,+ object_id: &str,+ object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdate, Error> {let server = self.get_provider(&self.provider_type.read());let database_id = object_id.to_string();FutureResult::new(async move {server?.database_service()- .get_collab_update(&database_id)+ .get_collab_update(&database_id, object_ty).await})}@@ -223,12 +230,13 @@ impl DatabaseCloudService for AppFlowyServerProvider {fn batch_get_collab_updates(&self,object_ids: Vec<String>,- ) -> FutureResult<CollabObjectUpdateByOid, FlowyError> {+ object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdateByOid, Error> {let server = self.get_provider(&self.provider_type.read());FutureResult::new(async move {server?.database_service()- .batch_get_collab_updates(object_ids)+ .batch_get_collab_updates(object_ids, object_ty).await})}@@ -236,7 +244,7 @@ impl DatabaseCloudService for AppFlowyServerProvider {fn get_collab_latest_snapshot(&self,object_id: &str,- ) -> FutureResult<Option<DatabaseSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DatabaseSnapshot>, Error> {let server = self.get_provider(&self.provider_type.read());let database_id = object_id.to_string();FutureResult::new(async move {@@ -249,7 +257,7 @@ impl DatabaseCloudService for AppFlowyServerProvider {}impl DocumentCloudService for AppFlowyServerProvider {- fn get_document_updates(&self, document_id: &str) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ fn get_document_updates(&self, document_id: &str) -> FutureResult<Vec<Vec<u8>>, Error> {let server = self.get_provider(&self.provider_type.read());let document_id = document_id.to_string();FutureResult::new(async move {@@ -263,7 +271,7 @@ impl DocumentCloudService for AppFlowyServerProvider {fn get_document_latest_snapshot(&self,document_id: &str,- ) -> FutureResult<Option<DocumentSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DocumentSnapshot>, Error> {let server = self.get_provider(&self.provider_type.read());let document_id = document_id.to_string();FutureResult::new(async move {@@ -274,7 +282,7 @@ impl DocumentCloudService for AppFlowyServerProvider {})}- fn get_document_data(&self, document_id: &str) -> FutureResult<Option<DocumentData>, FlowyError> {+ fn get_document_data(&self, document_id: &str) -> FutureResult<Option<DocumentData>, Error> {let server = self.get_provider(&self.provider_type.read());let document_id = document_id.to_string();FutureResult::new(async move {@@ -334,3 +342,31 @@ fn current_server_provider() -> ServerProviderType {Some(provider_type) => provider_type,}}++struct LocalServerDBImpl {+ storage_path: String,+}++impl LocalServerDB for LocalServerDBImpl {+ fn get_user_profile(&self, uid: i64) -> Result<Option<UserProfile>, FlowyError> {+ let sqlite_db = open_user_db(&self.storage_path, uid)?;+ let user_profile = get_user_profile(&sqlite_db, uid).ok();+ Ok(user_profile)+ }++ fn get_user_workspace(&self, uid: i64) -> Result<Option<UserWorkspace>, FlowyError> {+ let sqlite_db = open_user_db(&self.storage_path, uid)?;+ let user_workspace = get_user_workspace(&sqlite_db, uid)?;+ Ok(user_workspace)+ }++ fn get_collab_updates(&self, uid: i64, object_id: &str) -> Result<Vec<Vec<u8>>, FlowyError> {+ let collab_db = open_collab_db(&self.storage_path, uid)?;+ let read_txn = collab_db.read_txn();+ let updates = read_txn+ .get_all_updates(uid, object_id)+ .map_err(|e| FlowyError::internal().context(format!("Failed to open collab db: {:?}", e)))?;++ Ok(updates)+ }+}diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rsindex 61780822ff..5f796a7e67 100644--- a/frontend/rust-lib/flowy-core/src/lib.rs+++ b/frontend/rust-lib/flowy-core/src/lib.rs@@ -11,17 +11,16 @@ use std::{use appflowy_integrate::collab_builder::{AppFlowyCollabBuilder, CollabStorageType};use tokio::sync::RwLock;-use tracing::debug;-use flowy_database2::DatabaseManager2;-use flowy_document2::manager::DocumentManager as DocumentManager2;+use flowy_database2::DatabaseManager;+use flowy_document2::manager::DocumentManager;use flowy_error::FlowyResult;use flowy_folder2::manager::{FolderInitializeData, FolderManager};use flowy_sqlite::kv::KV;use flowy_task::{TaskDispatcher, TaskRunner};-use flowy_user::entities::UserProfile;use flowy_user::event_map::{SignUpContext, UserCloudServiceProvider, UserStatusCallback};-use flowy_user::services::{get_supabase_config, AuthType, UserSession, UserSessionConfig};+use flowy_user::services::{get_supabase_config, UserSession, UserSessionConfig};+use flowy_user_deps::entities::{AuthType, UserProfile, UserWorkspace};use lib_dispatch::prelude::*;use lib_dispatch::runtime::tokio_default_runtime;use lib_infra::future::{to_fut, Fut};@@ -113,9 +112,9 @@ pub struct AppFlowyCore {#[allow(dead_code)]pub config: AppFlowyCoreConfig,pub user_session: Arc<UserSession>,- pub document_manager2: Arc<DocumentManager2>,+ pub document_manager: Arc<DocumentManager>,pub folder_manager: Arc<FolderManager>,- pub database_manager: Arc<DatabaseManager2>,+ pub database_manager: Arc<DatabaseManager>,pub event_dispatcher: Arc<AFPluginDispatcher>,pub server_provider: Arc<AppFlowyServerProvider>,pub task_dispatcher: Arc<RwLock<TaskDispatcher>>,@@ -135,7 +134,7 @@ impl AppFlowyCore {// Init the key value databaseinit_kv(&config.storage_path);- debug!("🔥 {:?}", &config);+ tracing::info!("🔥 {:?}", &config);let runtime = tokio_default_runtime().unwrap();let task_scheduler = TaskDispatcher::new(Duration::from_secs(2));let task_dispatcher = Arc::new(RwLock::new(task_scheduler));@@ -146,52 +145,61 @@ impl AppFlowyCore {get_supabase_config(),));- let (user_session, folder_manager, server_provider, database_manager, document_manager2) =- runtime.block_on(async {- let user_session = mk_user_session(&config, server_provider.clone());- /// The shared collab builder is used to build the [Collab] instance. The plugins will be loaded- /// on demand based on the [CollabPluginConfig].- let collab_builder = Arc::new(AppFlowyCollabBuilder::new(- server_provider.clone(),- Some(Arc::new(SnapshotDBImpl(Arc::downgrade(&user_session)))),- ));-- let database_manager2 = Database2DepsResolver::resolve(- Arc::downgrade(&user_session),- task_dispatcher.clone(),- collab_builder.clone(),- server_provider.clone(),- )- .await;-- let document_manager2 = Document2DepsResolver::resolve(- Arc::downgrade(&user_session),- &database_manager2,- collab_builder.clone(),- server_provider.clone(),- );-- let folder_manager = Folder2DepsResolver::resolve(- Arc::downgrade(&user_session),- &document_manager2,- &database_manager2,- collab_builder,- server_provider.clone(),- )- .await;-- (- user_session,- folder_manager,- server_provider,- database_manager2,- document_manager2,- )- });+ let (+ user_session,+ folder_manager,+ server_provider,+ database_manager,+ document_manager,+ collab_builder,+ ) = runtime.block_on(async {+ let user_session = mk_user_session(&config, server_provider.clone());+ /// The shared collab builder is used to build the [Collab] instance. The plugins will be loaded+ /// on demand based on the [CollabPluginConfig].+ let collab_builder = Arc::new(AppFlowyCollabBuilder::new(+ server_provider.clone(),+ Some(Arc::new(SnapshotDBImpl(Arc::downgrade(&user_session)))),+ ));++ let database_manager = DatabaseDepsResolver::resolve(+ Arc::downgrade(&user_session),+ task_dispatcher.clone(),+ collab_builder.clone(),+ server_provider.clone(),+ )+ .await;++ let document_manager = DocumentDepsResolver::resolve(+ Arc::downgrade(&user_session),+ &database_manager,+ collab_builder.clone(),+ server_provider.clone(),+ );++ let folder_manager = FolderDepsResolver::resolve(+ Arc::downgrade(&user_session),+ &document_manager,+ &database_manager,+ collab_builder.clone(),+ server_provider.clone(),+ )+ .await;++ (+ user_session,+ folder_manager,+ server_provider,+ database_manager,+ document_manager,+ collab_builder,+ )+ });let user_status_listener = UserStatusCallbackImpl {+ collab_builder,folder_manager: folder_manager.clone(),database_manager: database_manager.clone(),+ document_manager: document_manager.clone(),config: config.clone(),};@@ -204,17 +212,17 @@ impl AppFlowyCore {let event_dispatcher = Arc::new(AFPluginDispatcher::construct(runtime, || {make_plugins(- &folder_manager,- &database_manager,- &user_session,- &document_manager2,+ Arc::downgrade(&folder_manager),+ Arc::downgrade(&database_manager),+ Arc::downgrade(&user_session),+ Arc::downgrade(&document_manager),)}));Self {config,user_session,- document_manager2,+ document_manager,folder_manager,database_manager,event_dispatcher,@@ -223,6 +231,7 @@ impl AppFlowyCore {}}+ /// Only expose the dispatcher in testpub fn dispatcher(&self) -> Arc<AFPluginDispatcher> {self.event_dispatcher.clone()}@@ -254,8 +263,10 @@ fn mk_user_session(}struct UserStatusCallbackImpl {+ collab_builder: Arc<AppFlowyCollabBuilder>,folder_manager: Arc<FolderManager>,- database_manager: Arc<DatabaseManager2>,+ database_manager: Arc<DatabaseManager>,+ document_manager: Arc<DocumentManager>,#[allow(dead_code)]config: AppFlowyCoreConfig,}@@ -263,32 +274,56 @@ struct UserStatusCallbackImpl {impl UserStatusCallback for UserStatusCallbackImpl {fn auth_type_did_changed(&self, _auth_type: AuthType) {}- fn did_init(&self, user_id: i64, workspace_id: &str) -> Fut<FlowyResult<()>> {+ fn did_init(&self, user_id: i64, user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>> {let user_id = user_id.to_owned();- let workspace_id = workspace_id.to_owned();+ let user_workspace = user_workspace.clone();+ let collab_builder = self.collab_builder.clone();let folder_manager = self.folder_manager.clone();let database_manager = self.database_manager.clone();+ let document_manager = self.document_manager.clone();to_fut(async move {+ collab_builder.initialize(user_workspace.id.clone());folder_manager- .initialize(user_id, &workspace_id, FolderInitializeData::Empty)+ .initialize(user_id, &user_workspace.id, FolderInitializeData::Empty)+ .await?;+ database_manager+ .initialize(+ user_id,+ user_workspace.id.clone(),+ user_workspace.database_storage_id,+ )+ .await?;+ document_manager+ .initialize(user_id, user_workspace.id).await?;- database_manager.initialize(user_id).await?;Ok(())})}- fn did_sign_in(&self, user_id: i64, workspace_id: &str) -> Fut<FlowyResult<()>> {+ fn did_sign_in(&self, user_id: i64, user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>> {let user_id = user_id.to_owned();- let workspace_id = workspace_id.to_owned();+ let user_workspace = user_workspace.clone();+ let collab_builder = self.collab_builder.clone();let folder_manager = self.folder_manager.clone();let database_manager = self.database_manager.clone();+ let document_manager = self.document_manager.clone();to_fut(async move {+ collab_builder.initialize(user_workspace.id.clone());folder_manager- .initialize_when_sign_in(user_id, &workspace_id)+ .initialize_with_workspace_id(user_id, &user_workspace.id)+ .await?;+ database_manager+ .initialize(+ user_id,+ user_workspace.id.clone(),+ user_workspace.database_storage_id,+ )+ .await?;+ document_manager+ .initialize(user_id, user_workspace.id).await?;- database_manager.initialize(user_id).await?;Ok(())})}@@ -297,25 +332,36 @@ impl UserStatusCallback for UserStatusCallbackImpl {&self,context: SignUpContext,user_profile: &UserProfile,+ user_workspace: &UserWorkspace,) -> Fut<FlowyResult<()>> {let user_profile = user_profile.clone();+ let collab_builder = self.collab_builder.clone();let folder_manager = self.folder_manager.clone();let database_manager = self.database_manager.clone();+ let user_workspace = user_workspace.clone();+ let document_manager = self.document_manager.clone();to_fut(async move {+ collab_builder.initialize(user_workspace.id.clone());folder_manager- .initialize_when_sign_up(+ .initialize_with_new_user(user_profile.id,&user_profile.token,context.is_new,context.local_folder,- &user_profile.workspace_id,+ &user_workspace.id,).await?;-database_manager- .initialize_with_new_user(user_profile.id, &user_profile.token)+ .initialize_with_new_user(+ user_profile.id,+ user_workspace.id.clone(),+ user_workspace.database_storage_id,+ ).await?;+ document_manager+ .initialize_with_new_user(user_profile.id, user_workspace.id)+ .await?;Ok(())})}@@ -327,6 +373,37 @@ impl UserStatusCallback for UserStatusCallbackImpl {Ok(())})}++ fn open_workspace(&self, user_id: i64, user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>> {+ let user_workspace = user_workspace.clone();+ let collab_builder = self.collab_builder.clone();+ let folder_manager = self.folder_manager.clone();+ let database_manager = self.database_manager.clone();+ let document_manager = self.document_manager.clone();++ to_fut(async move {+ collab_builder.initialize(user_workspace.id.clone());+ folder_manager+ .initialize_with_workspace_id(user_id, &user_workspace.id)+ .await?;++ database_manager+ .initialize(+ user_id,+ user_workspace.id.clone(),+ user_workspace.database_storage_id,+ )+ .await?;+ document_manager+ .initialize(user_id, user_workspace.id)+ .await?;+ Ok(())+ })+ }++ fn did_update_network(&self, reachable: bool) {+ self.collab_builder.update_network(reachable);+ }}impl From<ServerProviderType> for CollabStorageType {diff --git a/frontend/rust-lib/flowy-core/src/module.rs b/frontend/rust-lib/flowy-core/src/module.rsindex 9297aa5c98..518ec709fd 100644--- a/frontend/rust-lib/flowy-core/src/module.rs+++ b/frontend/rust-lib/flowy-core/src/module.rs@@ -1,22 +1,22 @@-use std::sync::Arc;+use std::sync::Weak;-use flowy_database2::DatabaseManager2;+use flowy_database2::DatabaseManager;use flowy_document2::manager::DocumentManager as DocumentManager2;use flowy_folder2::manager::FolderManager;use flowy_user::services::UserSession;use lib_dispatch::prelude::AFPlugin;pub fn make_plugins(- folder_manager: &Arc<FolderManager>,- database_manager: &Arc<DatabaseManager2>,- user_session: &Arc<UserSession>,- document_manager2: &Arc<DocumentManager2>,+ folder_manager: Weak<FolderManager>,+ database_manager: Weak<DatabaseManager>,+ user_session: Weak<UserSession>,+ document_manager2: Weak<DocumentManager2>,) -> Vec<AFPlugin> {- let user_plugin = flowy_user::event_map::init(user_session.clone());- let folder_plugin = flowy_folder2::event_map::init(folder_manager.clone());+ let user_plugin = flowy_user::event_map::init(user_session);+ let folder_plugin = flowy_folder2::event_map::init(folder_manager);let network_plugin = flowy_net::event_map::init();- let database_plugin = flowy_database2::event_map::init(database_manager.clone());- let document_plugin2 = flowy_document2::event_map::init(document_manager2.clone());+ let database_plugin = flowy_database2::event_map::init(database_manager);+ let document_plugin2 = flowy_document2::event_map::init(document_manager2);let config_plugin = flowy_config::event_map::init();vec![user_plugin,diff --git a/frontend/rust-lib/flowy-database-deps/Cargo.toml b/frontend/rust-lib/flowy-database-deps/Cargo.tomlnew file mode 100644index 0000000000..4ecdc86828--- /dev/null+++ b/frontend/rust-lib/flowy-database-deps/Cargo.toml@@ -0,0 +1,12 @@+[package]+name = "flowy-database-deps"+version = "0.1.0"+edition = "2021"++# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html++[dependencies]+lib-infra = { path = "../../../shared-lib/lib-infra" }+flowy-error = { path = "../flowy-error" }+collab-plugins = { version = "0.1.0" }+anyhow = "1.0.71"\ No newline at end of filediff --git a/frontend/rust-lib/flowy-database-deps/src/cloud.rs b/frontend/rust-lib/flowy-database-deps/src/cloud.rsnew file mode 100644index 0000000000..f6a9df942b--- /dev/null+++ b/frontend/rust-lib/flowy-database-deps/src/cloud.rs@@ -0,0 +1,38 @@+use anyhow::Error;+use std::collections::HashMap;++use collab_plugins::cloud_storage::CollabType;++use lib_infra::future::FutureResult;++pub type CollabObjectUpdateByOid = HashMap<String, CollabObjectUpdate>;+pub type CollabObjectUpdate = Vec<Vec<u8>>;++/// A trait for database cloud service.+/// Each kind of server should implement this trait. Check out the [AppFlowyServerProvider] of+/// [flowy-server] crate for more information.+pub trait DatabaseCloudService: Send + Sync {+ fn get_collab_update(+ &self,+ object_id: &str,+ object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdate, Error>;++ fn batch_get_collab_updates(+ &self,+ object_ids: Vec<String>,+ object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdateByOid, Error>;++ fn get_collab_latest_snapshot(+ &self,+ object_id: &str,+ ) -> FutureResult<Option<DatabaseSnapshot>, Error>;+}++pub struct DatabaseSnapshot {+ pub snapshot_id: i64,+ pub database_id: String,+ pub data: Vec<u8>,+ pub created_at: i64,+}diff --git a/frontend/rust-lib/flowy-database-deps/src/lib.rs b/frontend/rust-lib/flowy-database-deps/src/lib.rsnew file mode 100644index 0000000000..1ede32218e--- /dev/null+++ b/frontend/rust-lib/flowy-database-deps/src/lib.rs@@ -0,0 +1 @@+pub mod cloud;diff --git a/frontend/rust-lib/flowy-database2/Cargo.toml b/frontend/rust-lib/flowy-database2/Cargo.tomlindex 825faba6b4..1ae4ab5a55 100644--- a/frontend/rust-lib/flowy-database2/Cargo.toml+++ b/frontend/rust-lib/flowy-database2/Cargo.toml@@ -9,12 +9,13 @@ edition = "2021"collab = { version = "0.1.0" }collab-database = { version = "0.1.0" }appflowy-integrate = {version = "0.1.0" }+flowy-database-deps = { path = "../flowy-database-deps" }flowy-derive = { path = "../../../shared-lib/flowy-derive" }flowy-notification = { path = "../flowy-notification" }parking_lot = "0.12.1"protobuf = {version = "2.28.0"}-flowy-error = { path = "../flowy-error", features = ["adaptor_dispatch", "collab"]}+flowy-error = { path = "../flowy-error", features = ["impl_from_dispatch_error", "impl_from_collab"]}lib-dispatch = { path = "../lib-dispatch" }tokio = { version = "1.26", features = ["sync"] }flowy-task= { path = "../flowy-task" }diff --git a/frontend/rust-lib/flowy-database2/src/deps.rs b/frontend/rust-lib/flowy-database2/src/deps.rsdeleted file mode 100644index 009ea664e3..0000000000--- a/frontend/rust-lib/flowy-database2/src/deps.rs+++ /dev/null@@ -1,38 +0,0 @@-use std::sync::Arc;--use appflowy_integrate::RocksCollabDB;-pub use collab_database::user::CollabObjectUpdate;-pub use collab_database::user::CollabObjectUpdateByOid;--use flowy_error::FlowyError;-use lib_infra::future::FutureResult;--pub trait DatabaseUser2: Send + Sync {- fn user_id(&self) -> Result<i64, FlowyError>;- fn token(&self) -> Result<Option<String>, FlowyError>;- fn collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError>;-}--/// A trait for database cloud service.-/// Each kind of server should implement this trait. Check out the [AppFlowyServerProvider] of-/// [flowy-server] crate for more information.-pub trait DatabaseCloudService: Send + Sync {- fn get_collab_update(&self, object_id: &str) -> FutureResult<CollabObjectUpdate, FlowyError>;-- fn batch_get_collab_updates(- &self,- object_ids: Vec<String>,- ) -> FutureResult<CollabObjectUpdateByOid, FlowyError>;-- fn get_collab_latest_snapshot(- &self,- object_id: &str,- ) -> FutureResult<Option<DatabaseSnapshot>, FlowyError>;-}--pub struct DatabaseSnapshot {- pub snapshot_id: i64,- pub database_id: String,- pub data: Vec<u8>,- pub created_at: i64,-}diff --git a/frontend/rust-lib/flowy-database2/src/event_handler.rs b/frontend/rust-lib/flowy-database2/src/event_handler.rsindex 7a8c38ab69..3db041d2ea 100644--- a/frontend/rust-lib/flowy-database2/src/event_handler.rs+++ b/frontend/rust-lib/flowy-database2/src/event_handler.rs@@ -1,4 +1,4 @@-use std::sync::Arc;+use std::sync::{Arc, Weak};use collab_database::database::gen_row_id;use collab_database::rows::RowId;@@ -8,7 +8,7 @@ use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResuse lib_infra::util::timestamp;use crate::entities::*;-use crate::manager::DatabaseManager2;+use crate::manager::DatabaseManager;use crate::services::cell::CellBuilder;use crate::services::field::checklist_type_option::ChecklistCellChangeset;use crate::services::field::{@@ -17,11 +17,21 @@ use crate::services::field::{use crate::services::group::{GroupChangeset, GroupSettingChangeset};use crate::services::share::csv::CSVFormat;+fn upgrade_manager(+ database_manager: AFPluginState<Weak<DatabaseManager>>,+) -> FlowyResult<Arc<DatabaseManager>> {+ let manager = database_manager+ .upgrade()+ .ok_or(FlowyError::internal().context("The database manager is already dropped"))?;+ Ok(manager)+}+#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_database_data_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<DatabasePB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_editor = manager.get_database_with_view_id(view_id.as_ref()).await?;let data = database_editor.get_database_data(view_id.as_ref()).await?;@@ -31,8 +41,9 @@ pub(crate) async fn get_database_data_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn open_database_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_id = manager.get_database_id_with_view_id(view_id.as_ref())@@ -44,8 +55,9 @@ pub(crate) async fn open_database_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_database_id_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<DatabaseIdPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_id = manager.get_database_id_with_view_id(view_id.as_ref())@@ -56,8 +68,9 @@ pub(crate) async fn get_database_id_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_database_setting_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<DatabaseViewSettingPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_editor = manager.get_database_with_view_id(view_id.as_ref()).await?;let data = database_editor@@ -69,8 +82,9 @@ pub(crate) async fn get_database_setting_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn update_database_setting_handler(data: AFPluginData<DatabaseSettingChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: DatabaseSettingChangesetParams = data.into_inner().try_into()?;let editor = manager.get_database_with_view_id(¶ms.view_id).await?;@@ -100,8 +114,9 @@ pub(crate) async fn update_database_setting_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_all_filters_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedFilterPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_editor = manager.get_database_with_view_id(view_id.as_ref()).await?;let filters = database_editor.get_all_filters(view_id.as_ref()).await;@@ -111,8 +126,9 @@ pub(crate) async fn get_all_filters_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_all_sorts_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedSortPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_editor = manager.get_database_with_view_id(view_id.as_ref()).await?;let sorts = database_editor.get_all_sorts(view_id.as_ref()).await;@@ -122,8 +138,9 @@ pub(crate) async fn get_all_sorts_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn delete_all_sorts_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id: DatabaseViewIdPB = data.into_inner();let database_editor = manager.get_database_with_view_id(view_id.as_ref()).await?;database_editor.delete_all_sorts(view_id.as_ref()).await;@@ -133,8 +150,9 @@ pub(crate) async fn delete_all_sorts_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_fields_handler(data: AFPluginData<GetFieldPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedFieldPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: GetFieldParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let fields = database_editor@@ -149,8 +167,9 @@ pub(crate) async fn get_fields_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_primary_field_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<FieldPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id = data.into_inner().value;let database_editor = manager.get_database_with_view_id(&view_id).await?;let mut fields = database_editor@@ -177,8 +196,9 @@ pub(crate) async fn get_primary_field_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn update_field_handler(data: AFPluginData<FieldChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: FieldChangesetParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor.update_field(params).await?;@@ -188,8 +208,9 @@ pub(crate) async fn update_field_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn update_field_type_option_handler(data: AFPluginData<TypeOptionChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: TypeOptionChangesetParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;if let Some(old_field) = database_editor.get_field(¶ms.field_id) {@@ -211,8 +232,9 @@ pub(crate) async fn update_field_type_option_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn delete_field_handler(data: AFPluginData<DeleteFieldPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: FieldIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor.delete_field(¶ms.field_id).await?;@@ -222,8 +244,9 @@ pub(crate) async fn delete_field_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn switch_to_field_handler(data: AFPluginData<UpdateFieldTypePayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: EditFieldParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let old_field = database_editor.get_field(¶ms.field_id);@@ -257,8 +280,9 @@ pub(crate) async fn switch_to_field_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn duplicate_field_handler(data: AFPluginData<DuplicateFieldPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: FieldIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -271,8 +295,9 @@ pub(crate) async fn duplicate_field_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_field_type_option_data_handler(data: AFPluginData<TypeOptionPathPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<TypeOptionPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: TypeOptionPathParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;if let Some((field, data)) = database_editor@@ -294,8 +319,9 @@ pub(crate) async fn get_field_type_option_data_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn create_field_type_option_data_handler(data: AFPluginData<CreateFieldPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<TypeOptionPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CreateFieldParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let (field, data) = database_editor@@ -313,8 +339,9 @@ pub(crate) async fn create_field_type_option_data_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn move_field_handler(data: AFPluginData<MoveFieldPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: MoveFieldParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -331,8 +358,9 @@ pub(crate) async fn move_field_handler(// #[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn get_row_handler(data: AFPluginData<RowIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<OptionalRowPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: RowIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let row = database_editor@@ -343,8 +371,9 @@ pub(crate) async fn get_row_handler(pub(crate) async fn get_row_meta_handler(data: AFPluginData<RowIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RowMetaPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: RowIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;match database_editor.get_row_meta(¶ms.view_id, ¶ms.row_id) {@@ -355,8 +384,9 @@ pub(crate) async fn get_row_meta_handler(pub(crate) async fn update_row_meta_handler(data: AFPluginData<UpdateRowMetaChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let params: UpdateRowMetaParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let row_id = RowId::from(params.id.clone());@@ -367,8 +397,9 @@ pub(crate) async fn update_row_meta_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn delete_row_handler(data: AFPluginData<RowIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: RowIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor.delete_row(¶ms.row_id).await;@@ -378,8 +409,9 @@ pub(crate) async fn delete_row_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn duplicate_row_handler(data: AFPluginData<RowIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: RowIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -391,8 +423,9 @@ pub(crate) async fn duplicate_row_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn move_row_handler(data: AFPluginData<MoveRowPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: MoveRowParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -404,8 +437,9 @@ pub(crate) async fn move_row_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn create_row_handler(data: AFPluginData<CreateRowPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RowMetaPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CreateRowParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let fields = database_editor.get_fields(¶ms.view_id, None);@@ -433,8 +467,9 @@ pub(crate) async fn create_row_handler(// #[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_cell_handler(data: AFPluginData<CellIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<CellPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CellIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let cell = database_editor@@ -447,8 +482,9 @@ pub(crate) async fn get_cell_handler(#[tracing::instrument(level = "debug", skip_all, err)]pub(crate) async fn update_cell_handler(data: AFPluginData<CellChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CellChangesetPB = data.into_inner();let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -465,8 +501,9 @@ pub(crate) async fn update_cell_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn new_select_option_handler(data: AFPluginData<CreateSelectOptionPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<SelectOptionPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CreateSelectOptionParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let result = database_editor@@ -483,8 +520,9 @@ pub(crate) async fn new_select_option_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn insert_or_update_select_option_handler(data: AFPluginData<RepeatedSelectOptionPayload>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params = data.into_inner();let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -501,8 +539,9 @@ pub(crate) async fn insert_or_update_select_option_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn delete_select_option_handler(data: AFPluginData<RepeatedSelectOptionPayload>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params = data.into_inner();let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -519,8 +558,9 @@ pub(crate) async fn delete_select_option_handler(#[tracing::instrument(level = "trace", skip(data, manager), err)]pub(crate) async fn get_select_option_handler(data: AFPluginData<CellIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<SelectOptionCellDataPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CellIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let options = database_editor@@ -532,8 +572,9 @@ pub(crate) async fn get_select_option_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_select_option_cell_handler(data: AFPluginData<SelectOptionCellChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: SelectOptionCellChangesetParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.cell_identifier.view_id)@@ -556,8 +597,9 @@ pub(crate) async fn update_select_option_cell_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_checklist_cell_data_handler(data: AFPluginData<CellIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<ChecklistCellDataPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CellIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let data = database_editor@@ -569,8 +611,9 @@ pub(crate) async fn get_checklist_cell_data_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_checklist_cell_handler(data: AFPluginData<ChecklistCellDataChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let params: ChecklistCellDataChangesetParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let changeset = ChecklistCellChangeset {@@ -588,8 +631,9 @@ pub(crate) async fn update_checklist_cell_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_date_cell_handler(data: AFPluginData<DateChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> Result<(), FlowyError> {+ let manager = upgrade_manager(manager)?;let data = data.into_inner();let cell_id: CellIdParams = data.cell_id.try_into()?;let cell_changeset = DateCellChangeset {@@ -612,8 +656,9 @@ pub(crate) async fn update_date_cell_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_groups_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedGroupPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: DatabaseViewIdPB = data.into_inner();let database_editor = manager.get_database_with_view_id(params.as_ref()).await?;let groups = database_editor.load_groups(params.as_ref()).await?;@@ -623,8 +668,9 @@ pub(crate) async fn get_groups_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn get_group_handler(data: AFPluginData<DatabaseGroupIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<GroupPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: DatabaseGroupIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let group = database_editor@@ -636,8 +682,9 @@ pub(crate) async fn get_group_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn set_group_by_field_handler(data: AFPluginData<GroupByFieldPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let params: GroupByFieldParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -649,8 +696,9 @@ pub(crate) async fn set_group_by_field_handler(#[tracing::instrument(level = "trace", skip_all, err)]pub(crate) async fn update_group_handler(data: AFPluginData<UpdateGroupPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let params: UpdateGroupParams = data.into_inner().try_into()?;let view_id = params.view_id.clone();let database_editor = manager.get_database_with_view_id(&view_id).await?;@@ -666,8 +714,9 @@ pub(crate) async fn update_group_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn move_group_handler(data: AFPluginData<MoveGroupPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let params: MoveGroupParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -679,8 +728,9 @@ pub(crate) async fn move_group_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn move_group_row_handler(data: AFPluginData<MoveGroupRowPayloadPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let params: MoveGroupRowParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;database_editor@@ -696,8 +746,9 @@ pub(crate) async fn move_group_row_handler(#[tracing::instrument(level = "debug", skip(manager), err)]pub(crate) async fn get_databases_handler(- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedDatabaseDescriptionPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let data = manager.get_all_databases_description().await;data_result_ok(data)}@@ -705,8 +756,9 @@ pub(crate) async fn get_databases_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn set_layout_setting_handler(data: AFPluginData<LayoutSettingChangesetPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let params: LayoutSettingChangeset = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let layout_params = LayoutSettingParams {@@ -721,8 +773,9 @@ pub(crate) async fn set_layout_setting_handler(pub(crate) async fn get_layout_setting_handler(data: AFPluginData<DatabaseLayoutMetaPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<DatabaseLayoutSettingPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: DatabaseLayoutMeta = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let layout_setting_pb = database_editor@@ -736,8 +789,9 @@ pub(crate) async fn get_layout_setting_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn get_calendar_events_handler(data: AFPluginData<CalendarEventRequestPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedCalendarEventPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CalendarEventRequestParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let events = database_editor@@ -749,8 +803,9 @@ pub(crate) async fn get_calendar_events_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn get_no_date_calendar_events_handler(data: AFPluginData<CalendarEventRequestPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedNoDateCalendarEventPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: CalendarEventRequestParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let _events = database_editor@@ -762,8 +817,9 @@ pub(crate) async fn get_no_date_calendar_events_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn get_calendar_event_handler(data: AFPluginData<RowIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<CalendarEventPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let params: RowIdParams = data.into_inner().try_into()?;let database_editor = manager.get_database_with_view_id(¶ms.view_id).await?;let event = database_editor@@ -778,8 +834,9 @@ pub(crate) async fn get_calendar_event_handler(#[tracing::instrument(level = "debug", skip(data, manager), err)]pub(crate) async fn move_calendar_event_handler(data: AFPluginData<MoveCalendarEventPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {+ let manager = upgrade_manager(manager)?;let data = data.into_inner();let cell_id: CellIdParams = data.cell_path.try_into()?;let cell_changeset = DateCellChangeset {@@ -801,7 +858,7 @@ pub(crate) async fn move_calendar_event_handler(#[tracing::instrument(level = "debug", skip_all, err)]pub(crate) async fn create_database_view(_data: AFPluginData<CreateDatabaseViewPayloadPB>,- _manager: AFPluginState<Arc<DatabaseManager2>>,+ _manager: AFPluginState<Weak<DatabaseManager>>,) -> FlowyResult<()> {// let data: CreateDatabaseViewParams = data.into_inner().try_into()?;Ok(())@@ -810,8 +867,9 @@ pub(crate) async fn create_database_view(#[tracing::instrument(level = "debug", skip_all, err)]pub(crate) async fn export_csv_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<DatabaseExportDataPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id = data.into_inner().value;let database = manager.get_database_with_view_id(&view_id).await?;let data = database.export_csv(CSVFormat::Original).await?;@@ -824,8 +882,9 @@ pub(crate) async fn export_csv_handler(#[tracing::instrument(level = "debug", skip_all, err)]pub(crate) async fn get_snapshots_handler(data: AFPluginData<DatabaseViewIdPB>,- manager: AFPluginState<Arc<DatabaseManager2>>,+ manager: AFPluginState<Weak<DatabaseManager>>,) -> DataResult<RepeatedDatabaseSnapshotPB, FlowyError> {+ let manager = upgrade_manager(manager)?;let view_id = data.into_inner().value;let snapshots = manager.get_database_snapshots(&view_id).await?;data_result_ok(RepeatedDatabaseSnapshotPB { items: snapshots })diff --git a/frontend/rust-lib/flowy-database2/src/event_map.rs b/frontend/rust-lib/flowy-database2/src/event_map.rsindex 8ec138981b..10e27aa7e9 100644--- a/frontend/rust-lib/flowy-database2/src/event_map.rs+++ b/frontend/rust-lib/flowy-database2/src/event_map.rs@@ -1,4 +1,4 @@-use std::sync::Arc;+use std::sync::Weak;use strum_macros::Display;@@ -6,9 +6,9 @@ use flowy_derive::{Flowy_Event, ProtoBuf_Enum};use lib_dispatch::prelude::*;use crate::event_handler::*;-use crate::manager::DatabaseManager2;+use crate::manager::DatabaseManager;-pub fn init(database_manager: Arc<DatabaseManager2>) -> AFPlugin {+pub fn init(database_manager: Weak<DatabaseManager>) -> AFPlugin {let plugin = AFPlugin::new().name(env!("CARGO_PKG_NAME")).state(database_manager);diff --git a/frontend/rust-lib/flowy-database2/src/lib.rs b/frontend/rust-lib/flowy-database2/src/lib.rsindex aa941c5010..9e9719b350 100644--- a/frontend/rust-lib/flowy-database2/src/lib.rs+++ b/frontend/rust-lib/flowy-database2/src/lib.rs@@ -1,11 +1,10 @@pub use manager::*;-pub mod deps;pub mod entities;mod event_handler;pub mod event_map;mod manager;-mod notification;+pub mod notification;mod protobuf;pub mod services;pub mod template;diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex 5bb586d7de..b4912c924b 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -1,23 +1,23 @@use std::collections::HashMap;-use std::sync::Arc;+use std::sync::{Arc, Weak};use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;-use appflowy_integrate::{CollabPersistenceConfig, RocksCollabDB};+use appflowy_integrate::{CollabPersistenceConfig, CollabType, RocksCollabDB};use collab::core::collab::{CollabRawData, MutexCollab};use collab_database::blocks::BlockEvent;use collab_database::database::{DatabaseData, YrsDocAction};use collab_database::error::DatabaseError;use collab_database::user::{- make_workspace_database_id, CollabFuture, CollabObjectUpdate, CollabObjectUpdateByOid,- DatabaseCollabService, WorkspaceDatabase,+ CollabFuture, CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCollabService,+ WorkspaceDatabase,};use collab_database::views::{CreateDatabaseParams, CreateViewParams, DatabaseLayout};use tokio::sync::RwLock;+use flowy_database_deps::cloud::DatabaseCloudService;use flowy_error::{internal_error, FlowyError, FlowyResult};use flowy_task::TaskDispatcher;-use crate::deps::{DatabaseCloudService, DatabaseUser2};use crate::entities::{DatabaseDescriptionPB, DatabaseLayoutPB, DatabaseSnapshotPB, DidFetchRowPB,RepeatedDatabaseDescriptionPB,@@ -27,8 +27,14 @@ use crate::services::database::DatabaseEditor;use crate::services::database_view::DatabaseLayoutDepsResolver;use crate::services::share::csv::{CSVFormat, CSVImporter, ImportResult};-pub struct DatabaseManager2 {- user: Arc<dyn DatabaseUser2>,+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>;+}++pub struct DatabaseManager {+ user: Arc<dyn DatabaseUser>,workspace_database: Arc<RwLock<Option<Arc<WorkspaceDatabase>>>>,task_scheduler: Arc<RwLock<TaskDispatcher>>,editors: RwLock<HashMap<String, Arc<DatabaseEditor>>>,@@ -36,9 +42,9 @@ pub struct DatabaseManager2 {cloud_service: Arc<dyn DatabaseCloudService>,}-impl DatabaseManager2 {+impl DatabaseManager {pub fn new(- database_user: Arc<dyn DatabaseUser2>,+ database_user: Arc<dyn DatabaseUser>,task_scheduler: Arc<RwLock<TaskDispatcher>>,collab_builder: Arc<AppFlowyCollabBuilder>,cloud_service: Arc<dyn DatabaseCloudService>,@@ -53,14 +59,23 @@ impl DatabaseManager2 {}}- fn is_collab_exist(&self, uid: i64, collab_db: &Arc<RocksCollabDB>, object_id: &str) -> bool {- let read_txn = collab_db.read_txn();- read_txn.is_exist(uid, object_id)+ fn is_collab_exist(&self, uid: i64, collab_db: &Weak<RocksCollabDB>, object_id: &str) -> bool {+ match collab_db.upgrade() {+ None => false,+ Some(collab_db) => {+ let read_txn = collab_db.read_txn();+ read_txn.is_exist(uid, object_id)+ },+ }}- pub async fn initialize(&self, uid: i64) -> FlowyResult<()> {+ pub async fn initialize(+ &self,+ uid: i64,+ _workspace_id: String,+ workspace_database_id: String,+ ) -> FlowyResult<()> {let collab_db = self.user.collab_db(uid)?;- let workspace_database_id = make_workspace_database_id(uid);let collab_builder = UserDatabaseCollabServiceImpl {collab_builder: self.collab_builder.clone(),cloud_service: self.cloud_service.clone(),@@ -73,7 +88,7 @@ impl DatabaseManager2 {tracing::trace!("workspace database not exist, try to fetch from remote");match self.cloud_service- .get_collab_update(&workspace_database_id)+ .get_collab_update(&workspace_database_id, CollabType::WorkspaceDatabase).await{Ok(updates) => collab_raw_data = updates,@@ -91,7 +106,7 @@ impl DatabaseManager2 {let collab = collab_builder.build_collab_with_config(uid,&workspace_database_id,- "databases",+ CollabType::WorkspaceDatabase,collab_db.clone(),collab_raw_data,&config,@@ -100,11 +115,21 @@ impl DatabaseManager2 {WorkspaceDatabase::open(uid, collab, collab_db, config, collab_builder);subscribe_block_event(&workspace_database);*self.workspace_database.write().await = Some(Arc::new(workspace_database));++ // Remove all existing editors+ self.editors.write().await.clear();Ok(())}- pub async fn initialize_with_new_user(&self, user_id: i64, _token: &str) -> FlowyResult<()> {- self.initialize(user_id).await?;+ pub async fn initialize_with_new_user(+ &self,+ user_id: i64,+ workspace_id: String,+ database_storage_id: String,+ ) -> FlowyResult<()> {+ self+ .initialize(user_id, workspace_id, database_storage_id)+ .await?;Ok(())}@@ -346,6 +371,7 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {fn get_collab_update(&self,object_id: &str,+ object_ty: CollabType,) -> CollabFuture<Result<CollabObjectUpdate, DatabaseError>> {let object_id = object_id.to_string();let weak_cloud_service = Arc::downgrade(&self.cloud_service);@@ -357,9 +383,8 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {},Some(cloud_service) => {let updates = cloud_service- .get_collab_update(&object_id)- .await- .map_err(|e| DatabaseError::Internal(Box::new(e)))?;+ .get_collab_update(&object_id, object_ty)+ .await?;Ok(updates)},}@@ -369,6 +394,7 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {fn batch_get_collab_update(&self,object_ids: Vec<String>,+ object_ty: CollabType,) -> CollabFuture<Result<CollabObjectUpdateByOid, DatabaseError>> {let weak_cloud_service = Arc::downgrade(&self.cloud_service);Box::pin(async move {@@ -379,9 +405,8 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {},Some(cloud_service) => {let updates = cloud_service- .batch_get_collab_updates(object_ids)- .await- .map_err(|e| DatabaseError::Internal(Box::new(e)))?;+ .batch_get_collab_updates(object_ids, object_ty)+ .await?;Ok(updates)},}@@ -392,8 +417,8 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {&self,uid: i64,object_id: &str,- object_name: &str,- collab_db: Arc<RocksCollabDB>,+ object_type: CollabType,+ collab_db: Weak<RocksCollabDB>,collab_raw_data: CollabRawData,config: &CollabPersistenceConfig,) -> Arc<MutexCollab> {@@ -402,7 +427,7 @@ impl DatabaseCollabService for UserDatabaseCollabServiceImpl {.build_with_config(uid,object_id,- object_name,+ object_type,collab_db,collab_raw_data,config,diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rsindex fc2d3e2d44..d986c85d4e 100644--- a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs@@ -74,7 +74,11 @@ impl DatabaseEditor {tokio::spawn(async move {while let Some(snapshot_state) = snapshot_state.next().await {if let Some(new_snapshot_id) = snapshot_state.snapshot_id() {- tracing::debug!("Did create database remote snapshot: {}", new_snapshot_id);+ tracing::debug!(+ "Did create {} database remote snapshot: {}",+ database_id,+ new_snapshot_id+ );send_notification(&database_id,DatabaseNotification::DidUpdateDatabaseSnapshotState,diff --git a/frontend/rust-lib/flowy-document-deps/Cargo.toml b/frontend/rust-lib/flowy-document-deps/Cargo.tomlnew file mode 100644index 0000000000..af40092bf6--- /dev/null+++ b/frontend/rust-lib/flowy-document-deps/Cargo.toml@@ -0,0 +1,12 @@+[package]+name = "flowy-document-deps"+version = "0.1.0"+edition = "2021"++# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html++[dependencies]+lib-infra = { path = "../../../shared-lib/lib-infra" }+flowy-error = { path = "../flowy-error" }+collab-document = { version = "0.1.0" }+anyhow = "1.0.71"\ No newline at end of filediff --git a/frontend/rust-lib/flowy-document-deps/src/cloud.rs b/frontend/rust-lib/flowy-document-deps/src/cloud.rsnew file mode 100644index 0000000000..65c6b69059--- /dev/null+++ b/frontend/rust-lib/flowy-document-deps/src/cloud.rs@@ -0,0 +1,25 @@+use anyhow::Error;+pub use collab_document::blocks::DocumentData;++use lib_infra::future::FutureResult;++/// A trait for document cloud service.+/// Each kind of server should implement this trait. Check out the [AppFlowyServerProvider] of+/// [flowy-server] crate for more information.+pub trait DocumentCloudService: Send + Sync + 'static {+ fn get_document_updates(&self, document_id: &str) -> FutureResult<Vec<Vec<u8>>, Error>;++ fn get_document_latest_snapshot(+ &self,+ document_id: &str,+ ) -> FutureResult<Option<DocumentSnapshot>, Error>;++ fn get_document_data(&self, document_id: &str) -> FutureResult<Option<DocumentData>, Error>;+}++pub struct DocumentSnapshot {+ pub snapshot_id: i64,+ pub document_id: String,+ pub data: Vec<u8>,+ pub created_at: i64,+}diff --git a/frontend/rust-lib/flowy-document-deps/src/lib.rs b/frontend/rust-lib/flowy-document-deps/src/lib.rsnew file mode 100644index 0000000000..1ede32218e--- /dev/null+++ b/frontend/rust-lib/flowy-document-deps/src/lib.rs@@ -0,0 +1 @@+pub mod cloud;diff --git a/frontend/rust-lib/flowy-document2/Cargo.toml b/frontend/rust-lib/flowy-document2/Cargo.tomlindex 16d9dba124..622359e4f6 100644--- a/frontend/rust-lib/flowy-document2/Cargo.toml+++ b/frontend/rust-lib/flowy-document2/Cargo.toml@@ -9,10 +9,11 @@ edition = "2021"collab = { version = "0.1.0" }collab-document = { version = "0.1.0" }appflowy-integrate = {version = "0.1.0" }+flowy-document-deps = { path = "../flowy-document-deps" }flowy-derive = { path = "../../../shared-lib/flowy-derive" }flowy-notification = { path = "../flowy-notification" }-flowy-error = { path = "../flowy-error", features = ["adaptor_serde", "adaptor_database", "adaptor_dispatch", "collab"] }+flowy-error = { path = "../flowy-error", features = ["impl_from_serde", "impl_from_sqlite", "impl_from_dispatch_error", "impl_from_collab"] }lib-dispatch = { path = "../lib-dispatch" }lib-infra = { path = "../../../shared-lib/lib-infra" }@@ -20,7 +21,6 @@ protobuf = {version = "2.28.0"}bytes = { version = "1.4" }nanoid = "0.4.0"parking_lot = "0.12.1"-strum = "0.21"strum_macros = "0.21"serde = { version = "1.0", features = ["derive"] }serde_json = {version = "1.0"}diff --git a/frontend/rust-lib/flowy-document2/src/deps.rs b/frontend/rust-lib/flowy-document2/src/deps.rsindex f92aa9815f..81c281f777 100644--- a/frontend/rust-lib/flowy-document2/src/deps.rs+++ b/frontend/rust-lib/flowy-document2/src/deps.rs@@ -1,34 +1 @@-use std::sync::Arc;--use appflowy_integrate::RocksCollabDB;pub use collab_document::blocks::DocumentData;--use flowy_error::FlowyError;-use lib_infra::future::FutureResult;--pub trait DocumentUser: Send + Sync {- fn user_id(&self) -> Result<i64, FlowyError>;- fn token(&self) -> Result<Option<String>, FlowyError>; // unused now.- fn collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError>;-}--/// A trait for document cloud service.-/// Each kind of server should implement this trait. Check out the [AppFlowyServerProvider] of-/// [flowy-server] crate for more information.-pub trait DocumentCloudService: Send + Sync + 'static {- fn get_document_updates(&self, document_id: &str) -> FutureResult<Vec<Vec<u8>>, FlowyError>;-- fn get_document_latest_snapshot(- &self,- document_id: &str,- ) -> FutureResult<Option<DocumentSnapshot>, FlowyError>;-- fn get_document_data(&self, document_id: &str) -> FutureResult<Option<DocumentData>, FlowyError>;-}--pub struct DocumentSnapshot {- pub snapshot_id: i64,- pub document_id: String,- pub data: Vec<u8>,- pub created_at: i64,-}diff --git a/frontend/rust-lib/flowy-document2/src/event_handler.rs b/frontend/rust-lib/flowy-document2/src/event_handler.rsindex a9b10dba4e..aa73d54a43 100644--- a/frontend/rust-lib/flowy-document2/src/event_handler.rs+++ b/frontend/rust-lib/flowy-document2/src/event_handler.rs@@ -4,7 +4,7 @@* which you can think of as a higher-level interface to interact with documents.*/-use std::sync::Arc;+use std::sync::{Arc, Weak};use collab_document::blocks::{json_str_to_hashmap, Block, BlockAction, BlockActionPayload, BlockActionType, BlockEvent,@@ -17,11 +17,21 @@ use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResuse crate::entities::*;use crate::{manager::DocumentManager, parser::json::parser::JsonToDocumentParser};+fn upgrade_document(+ document_manager: AFPluginState<Weak<DocumentManager>>,+) -> FlowyResult<Arc<DocumentManager>> {+ let manager = document_manager+ .upgrade()+ .ok_or(FlowyError::internal().context("The document manager is already dropped"))?;+ Ok(manager)+}+// Handler for creating a new documentpub(crate) async fn create_document_handler(data: AFPluginData<CreateDocumentPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> FlowyResult<()> {+ let manager = upgrade_document(manager)?;let params: CreateDocumentParams = data.into_inner().try_into()?;manager.create_document(¶ms.document_id, params.initial_data)?;Ok(())@@ -30,8 +40,9 @@ pub(crate) async fn create_document_handler(// Handler for opening an existing documentpub(crate) async fn open_document_handler(data: AFPluginData<OpenDocumentPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> DataResult<DocumentDataPB, FlowyError> {+ let manager = upgrade_document(manager)?;let params: OpenDocumentParams = data.into_inner().try_into()?;let doc_id = params.document_id;let document = manager.get_document(&doc_id).await?;@@ -41,8 +52,9 @@ pub(crate) async fn open_document_handler(pub(crate) async fn close_document_handler(data: AFPluginData<CloseDocumentPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> FlowyResult<()> {+ let manager = upgrade_document(manager)?;let params: CloseDocumentParams = data.into_inner().try_into()?;let doc_id = params.document_id;manager.close_document(&doc_id)?;@@ -53,8 +65,9 @@ pub(crate) async fn close_document_handler(// if the document does not exist, return an error.pub(crate) async fn get_document_data_handler(data: AFPluginData<OpenDocumentPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> DataResult<DocumentDataPB, FlowyError> {+ let manager = upgrade_document(manager)?;let params: OpenDocumentParams = data.into_inner().try_into()?;let doc_id = params.document_id;let document_data = manager.get_document_data(&doc_id).await?;@@ -64,8 +77,9 @@ pub(crate) async fn get_document_data_handler(// Handler for applying an action to a documentpub(crate) async fn apply_action_handler(data: AFPluginData<ApplyActionPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> FlowyResult<()> {+ let manager = upgrade_document(manager)?;let params: ApplyActionParams = data.into_inner().try_into()?;let doc_id = params.document_id;let document = manager.get_document(&doc_id).await?;@@ -76,7 +90,6 @@ pub(crate) async fn apply_action_handler(pub(crate) async fn convert_data_to_document(data: AFPluginData<ConvertDataPayloadPB>,- _manager: AFPluginState<Arc<DocumentManager>>,) -> DataResult<DocumentDataPB, FlowyError> {let payload = data.into_inner();let document = convert_data_to_document_internal(payload)?;@@ -100,8 +113,9 @@ pub fn convert_data_to_document_internal(pub(crate) async fn redo_handler(data: AFPluginData<DocumentRedoUndoPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> DataResult<DocumentRedoUndoResponsePB, FlowyError> {+ let manager = upgrade_document(manager)?;let params: DocumentRedoUndoParams = data.into_inner().try_into()?;let doc_id = params.document_id;let document = manager.get_document(&doc_id).await?;@@ -118,8 +132,9 @@ pub(crate) async fn redo_handler(pub(crate) async fn undo_handler(data: AFPluginData<DocumentRedoUndoPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> DataResult<DocumentRedoUndoResponsePB, FlowyError> {+ let manager = upgrade_document(manager)?;let params: DocumentRedoUndoParams = data.into_inner().try_into()?;let doc_id = params.document_id;let document = manager.get_document(&doc_id).await?;@@ -136,8 +151,9 @@ pub(crate) async fn undo_handler(pub(crate) async fn can_undo_redo_handler(data: AFPluginData<DocumentRedoUndoPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> DataResult<DocumentRedoUndoResponsePB, FlowyError> {+ let manager = upgrade_document(manager)?;let params: DocumentRedoUndoParams = data.into_inner().try_into()?;let doc_id = params.document_id;let document = manager.get_document(&doc_id).await?;@@ -154,8 +170,9 @@ pub(crate) async fn can_undo_redo_handler(pub(crate) async fn get_snapshot_handler(data: AFPluginData<OpenDocumentPayloadPB>,- manager: AFPluginState<Arc<DocumentManager>>,+ manager: AFPluginState<Weak<DocumentManager>>,) -> DataResult<RepeatedDocumentSnapshotPB, FlowyError> {+ let manager = upgrade_document(manager)?;let params: OpenDocumentParams = data.into_inner().try_into()?;let doc_id = params.document_id;let snapshots = manager.get_document_snapshots(&doc_id).await?;diff --git a/frontend/rust-lib/flowy-document2/src/event_map.rs b/frontend/rust-lib/flowy-document2/src/event_map.rsindex b5ce9a863c..6037e8bcea 100644--- a/frontend/rust-lib/flowy-document2/src/event_map.rs+++ b/frontend/rust-lib/flowy-document2/src/event_map.rs@@ -1,4 +1,5 @@-use std::sync::Arc;+use std::sync::Weak;+use strum_macros::Display;use flowy_derive::{Flowy_Event, ProtoBuf_Enum};@@ -7,7 +8,7 @@ use lib_dispatch::prelude::AFPlugin;use crate::event_handler::get_snapshot_handler;use crate::{event_handler::*, manager::DocumentManager};-pub fn init(document_manager: Arc<DocumentManager>) -> AFPlugin {+pub fn init(document_manager: Weak<DocumentManager>) -> AFPlugin {AFPlugin::new().name(env!("CARGO_PKG_NAME")).state(document_manager)diff --git a/frontend/rust-lib/flowy-document2/src/lib.rs b/frontend/rust-lib/flowy-document2/src/lib.rsindex ee0c15ffd6..6dd7fd1213 100644--- a/frontend/rust-lib/flowy-document2/src/lib.rs+++ b/frontend/rust-lib/flowy-document2/src/lib.rs@@ -8,5 +8,5 @@ pub mod parser;pub mod protobuf;pub mod deps;-mod notification;+pub mod notification;mod parse;diff --git a/frontend/rust-lib/flowy-document2/src/manager.rs b/frontend/rust-lib/flowy-document2/src/manager.rsindex dd74a1d6e1..824bcf05f6 100644--- a/frontend/rust-lib/flowy-document2/src/manager.rs+++ b/frontend/rust-lib/flowy-document2/src/manager.rs@@ -1,18 +1,26 @@+use std::sync::Weak;use std::{collections::HashMap, sync::Arc};use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;+use appflowy_integrate::{CollabType, RocksCollabDB};use collab::core::collab::MutexCollab;use collab_document::blocks::DocumentData;use collab_document::document::Document;use collab_document::YrsDocAction;use parking_lot::RwLock;+use flowy_document_deps::cloud::DocumentCloudService;use flowy_error::{internal_error, FlowyError, FlowyResult};-use crate::deps::{DocumentCloudService, DocumentUser};use crate::entities::DocumentSnapshotPB;use crate::{document::MutexDocument, document_data::default_document_data};+pub trait DocumentUser: Send + Sync {+ fn user_id(&self) -> Result<i64, FlowyError>;+ fn token(&self) -> Result<Option<String>, FlowyError>; // unused now.+ fn collab_db(&self, uid: i64) -> Result<Weak<RocksCollabDB>, FlowyError>;+}+pub struct DocumentManager {user: Arc<dyn DocumentUser>,collab_builder: Arc<AppFlowyCollabBuilder>,@@ -35,6 +43,15 @@ impl DocumentManager {}}+ pub async fn initialize(&self, _uid: i64, _workspace_id: String) -> FlowyResult<()> {+ self.documents.write().clear();+ Ok(())+ }++ pub async fn initialize_with_new_user(&self, uid: i64, workspace_id: String) -> FlowyResult<()> {+ self.initialize(uid, workspace_id).await?;+ Ok(())+ }/// Create a new document.////// if the document already exists, return the existing document.@@ -73,7 +90,7 @@ impl DocumentManager {let db = self.user.collab_db(uid)?;let collab = self.collab_builder- .build(uid, doc_id, "document", updates, db)?;+ .build(uid, doc_id, CollabType::Document, updates, db)?;let document = Arc::new(MutexDocument::open(doc_id, collab)?);// save the document to the memory and read it from the memory if we open the same document again.@@ -110,12 +127,13 @@ impl DocumentManager {pub fn delete_document(&self, doc_id: &str) -> FlowyResult<()> {let uid = self.user.user_id()?;- let db = self.user.collab_db(uid)?;- let _ = db.with_write_txn(|txn| {- txn.delete_doc(uid, &doc_id)?;- Ok(())- });- self.documents.write().remove(doc_id);+ if let Some(db) = self.user.collab_db(uid)?.upgrade() {+ let _ = db.with_write_txn(|txn| {+ txn.delete_doc(uid, &doc_id)?;+ Ok(())+ });+ self.documents.write().remove(doc_id);+ }Ok(())}@@ -151,15 +169,18 @@ impl DocumentManager {let db = self.user.collab_db(uid)?;let collab = self.collab_builder- .build(uid, doc_id, "document", updates, db)?;+ .build(uid, doc_id, CollabType::Document, updates, db)?;Ok(collab)}fn is_doc_exist(&self, doc_id: &str) -> FlowyResult<bool> {let uid = self.user.user_id()?;- let db = self.user.collab_db(uid)?;- let read_txn = db.read_txn();- Ok(read_txn.is_exist(uid, doc_id))+ if let Some(collab_db) = self.user.collab_db(uid)?.upgrade() {+ let read_txn = collab_db.read_txn();+ Ok(read_txn.is_exist(uid, doc_id))+ } else {+ Ok(false)+ }}/// Only expose this method for testingdiff --git a/frontend/rust-lib/flowy-document2/src/notification.rs b/frontend/rust-lib/flowy-document2/src/notification.rsindex b05e1a2669..94c5bed28f 100644--- a/frontend/rust-lib/flowy-document2/src/notification.rs+++ b/frontend/rust-lib/flowy-document2/src/notification.rs@@ -4,7 +4,7 @@ use flowy_notification::NotificationBuilder;const DOCUMENT_OBSERVABLE_SOURCE: &str = "Document";#[derive(ProtoBuf_Enum, Debug, Default)]-pub(crate) enum DocumentNotification {+pub enum DocumentNotification {#[default]Unknown = 0,diff --git a/frontend/rust-lib/flowy-document2/tests/document/util.rs b/frontend/rust-lib/flowy-document2/tests/document/util.rsindex 5f01b886fa..521ff1ffd3 100644--- a/frontend/rust-lib/flowy-document2/tests/document/util.rs+++ b/frontend/rust-lib/flowy-document2/tests/document/util.rs@@ -1,3 +1,4 @@+use anyhow::Error;use std::ops::Deref;use std::sync::Arc;@@ -9,11 +10,11 @@ use parking_lot::Once;use tempfile::TempDir;use tracing_subscriber::{fmt::Subscriber, util::SubscriberInitExt, EnvFilter};-use flowy_document2::deps::{DocumentCloudService, DocumentSnapshot, DocumentUser};use flowy_document2::document::MutexDocument;use flowy_document2::document_data::default_document_data;-use flowy_document2::manager::DocumentManager;-use flowy_error::FlowyError;+use flowy_document2::manager::{DocumentManager, DocumentUser};+use flowy_document_deps::cloud::*;+use lib_infra::future::FutureResult;pub struct DocumentTest {@@ -38,12 +39,12 @@ impl Deref for DocumentTest {}pub struct FakeUser {- kv: Arc<RocksCollabDB>,+ collab_db: Arc<RocksCollabDB>,}impl FakeUser {pub fn new() -> Self {- Self { kv: db() }+ Self { collab_db: db() }}}@@ -56,8 +57,11 @@ impl DocumentUser for FakeUser {Ok(None)}- fn collab_db(&self, _uid: i64) -> Result<std::sync::Arc<RocksCollabDB>, flowy_error::FlowyError> {- Ok(self.kv.clone())+ fn collab_db(+ &self,+ _uid: i64,+ ) -> Result<std::sync::Weak<RocksCollabDB>, flowy_error::FlowyError> {+ Ok(Arc::downgrade(&self.collab_db))}}@@ -106,21 +110,18 @@ pub fn gen_id() -> String {pub struct LocalTestDocumentCloudServiceImpl();impl DocumentCloudService for LocalTestDocumentCloudServiceImpl {- fn get_document_updates(&self, _document_id: &str) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ fn get_document_updates(&self, _document_id: &str) -> FutureResult<Vec<Vec<u8>>, Error> {FutureResult::new(async move { Ok(vec![]) })}fn get_document_latest_snapshot(&self,_document_id: &str,- ) -> FutureResult<Option<DocumentSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DocumentSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}- fn get_document_data(- &self,- _document_id: &str,- ) -> FutureResult<Option<DocumentData>, FlowyError> {+ fn get_document_data(&self, _document_id: &str) -> FutureResult<Option<DocumentData>, Error> {FutureResult::new(async move { Ok(None) })}}diff --git a/frontend/rust-lib/flowy-error/Cargo.toml b/frontend/rust-lib/flowy-error/Cargo.tomlindex 8a2fa14cce..59d8db22d5 100644--- a/frontend/rust-lib/flowy-error/Cargo.toml+++ b/frontend/rust-lib/flowy-error/Cargo.toml@@ -22,16 +22,20 @@ flowy-sqlite = { path = "../flowy-sqlite", optional = true}r2d2 = { version = "0.8", optional = true}collab-database = { version = "0.1.0", optional = true }collab-document = { version = "0.1.0", optional = true }+tokio-postgres = { version = "0.7.8", optional = true }+tokio = { version = "1.0", optional = true }[features]-adaptor_dispatch = ["lib-dispatch"]-adaptor_serde = ["serde_json"]-adaptor_reqwest = ["reqwest"]-adaptor_database = ["flowy-sqlite", "r2d2"]-adaptor_server_error = ["http-error-code"]+impl_from_dispatch_error = ["lib-dispatch"]+impl_from_serde = ["serde_json"]+impl_from_reqwest = ["reqwest"]+impl_from_sqlite = ["flowy-sqlite", "r2d2"]+impl_from_appflowy_cloud = ["http-error-code"]+impl_from_collab = ["collab-database", "collab-document", "impl_from_reqwest"]+impl_from_postgres = ["tokio-postgres"]+impl_from_tokio= ["tokio"]dart = ["flowy-codegen/dart"]ts = ["flowy-codegen/ts"]-collab = ["collab-database", "collab-document"][build-dependencies]flowy-codegen = { path = "../../../shared-lib/flowy-codegen", features = ["proto_gen"]}diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rsindex b4477a5d43..e89b7ec511 100644--- a/frontend/rust-lib/flowy-error/src/code.rs+++ b/frontend/rust-lib/flowy-error/src/code.rs@@ -57,9 +57,6 @@ pub enum ErrorCode {#[error("View name too long")]ViewNameTooLong = 17,- #[error("Http server connection error")]- HttpServerConnectError = 18,-#[error("Email can not be empty or whitespace")]EmailIsEmpty = 19,@@ -179,7 +176,7 @@ pub enum ErrorCode {#[error("Sql error")]SqlError = 58,- #[error("Http request error")]+ #[error("Http error")]HttpError = 59,#[error("The content should not be empty")]@@ -215,8 +212,14 @@ pub enum ErrorCode {#[error("Postgres database error")]PgDatabaseError = 70,+ #[error("Postgres transaction error")]+ PgTransactionError = 71,+#[error("Enable supabase sync")]- SupabaseSyncRequired = 71,+ SupabaseSyncRequired = 72,++ #[error("Conflict")]+ Conflict = 73,}impl ErrorCode {diff --git a/frontend/rust-lib/flowy-error/src/errors.rs b/frontend/rust-lib/flowy-error/src/errors.rsindex 411ffa1ae7..d422c92b83 100644--- a/frontend/rust-lib/flowy-error/src/errors.rs+++ b/frontend/rust-lib/flowy-error/src/errors.rs@@ -58,7 +58,6 @@ impl FlowyError {static_flowy_error!(view_desc, ErrorCode::ViewDescTooLong);static_flowy_error!(view_data, ErrorCode::ViewDataInvalid);static_flowy_error!(unauthorized, ErrorCode::UserUnauthorized);- static_flowy_error!(connection, ErrorCode::HttpServerConnectError);static_flowy_error!(email_empty, ErrorCode::EmailIsEmpty);static_flowy_error!(email_format, ErrorCode::EmailFormatInvalid);static_flowy_error!(email_exist, ErrorCode::EmailAlreadyExists);@@ -121,6 +120,7 @@ impl std::convert::From<protobuf::ProtobufError> for FlowyError {impl From<anyhow::Error> for FlowyError {fn from(e: anyhow::Error) -> Self {- FlowyError::internal().context(e)+ e.downcast::<FlowyError>()+ .unwrap_or_else(|err| FlowyError::new(ErrorCode::Internal, err))}}diff --git a/frontend/rust-lib/flowy-error/src/ext/mod.rs b/frontend/rust-lib/flowy-error/src/ext/mod.rsdeleted file mode 100644index 0789b6fb8c..0000000000--- a/frontend/rust-lib/flowy-error/src/ext/mod.rs+++ /dev/null@@ -1,20 +0,0 @@-// #[cfg(feature = "adaptor_ot")]-// pub mod ot;--#[cfg(feature = "adaptor_serde")]-pub mod serde;--#[cfg(feature = "adaptor_dispatch")]-pub mod dispatch;--#[cfg(feature = "adaptor_reqwest")]-pub mod reqwest;--#[cfg(feature = "adaptor_database")]-pub mod database;--#[cfg(feature = "adaptor_server_error")]-pub mod http_server;--#[cfg(feature = "collab")]-pub mod collab;diff --git a/frontend/rust-lib/flowy-error/src/ext/collab.rs b/frontend/rust-lib/flowy-error/src/impl_from/collab.rssimilarity index 100%rename from frontend/rust-lib/flowy-error/src/ext/collab.rsrename to frontend/rust-lib/flowy-error/src/impl_from/collab.rsdiff --git a/frontend/rust-lib/flowy-error/src/ext/database.rs b/frontend/rust-lib/flowy-error/src/impl_from/database.rssimilarity index 100%rename from frontend/rust-lib/flowy-error/src/ext/database.rsrename to frontend/rust-lib/flowy-error/src/impl_from/database.rsdiff --git a/frontend/rust-lib/flowy-error/src/ext/dispatch.rs b/frontend/rust-lib/flowy-error/src/impl_from/dispatch.rssimilarity index 100%rename from frontend/rust-lib/flowy-error/src/ext/dispatch.rsrename to frontend/rust-lib/flowy-error/src/impl_from/dispatch.rsdiff --git a/frontend/rust-lib/flowy-error/src/ext/http_server.rs b/frontend/rust-lib/flowy-error/src/impl_from/http_server.rssimilarity index 87%rename from frontend/rust-lib/flowy-error/src/ext/http_server.rsrename to frontend/rust-lib/flowy-error/src/impl_from/http_server.rsindex d7fa3355d2..658d5290a1 100644--- a/frontend/rust-lib/flowy-error/src/ext/http_server.rs+++ b/frontend/rust-lib/flowy-error/src/impl_from/http_server.rs@@ -9,7 +9,7 @@ impl std::convert::From<ServerErrorCode> for ErrorCode {ServerErrorCode::RecordNotFound => ErrorCode::RecordNotFound,ServerErrorCode::ConnectRefused| ServerErrorCode::ConnectTimeout- | ServerErrorCode::ConnectClose => ErrorCode::HttpServerConnectError,+ | ServerErrorCode::ConnectClose => ErrorCode::HttpError,_ => ErrorCode::Internal,}}diff --git a/frontend/rust-lib/flowy-error/src/impl_from/mod.rs b/frontend/rust-lib/flowy-error/src/impl_from/mod.rsnew file mode 100644index 0000000000..8005b7069d--- /dev/null+++ b/frontend/rust-lib/flowy-error/src/impl_from/mod.rs@@ -0,0 +1,26 @@+// #[cfg(feature = "adaptor_ot")]+// pub mod ot;++#[cfg(feature = "impl_from_serde")]+pub mod serde;++#[cfg(feature = "impl_from_dispatch_error")]+pub mod dispatch;++#[cfg(feature = "impl_from_reqwest")]+pub mod reqwest;++#[cfg(feature = "impl_from_sqlite")]+pub mod database;++#[cfg(feature = "impl_from_appflowy_cloud")]+pub mod http_server;++#[cfg(feature = "impl_from_collab")]+pub mod collab;++#[cfg(feature = "impl_from_postgres")]+mod postgres;++#[cfg(feature = "impl_from_tokio")]+mod tokio;diff --git a/frontend/rust-lib/flowy-error/src/impl_from/postgres.rs b/frontend/rust-lib/flowy-error/src/impl_from/postgres.rsnew file mode 100644index 0000000000..b8e045a9d0--- /dev/null+++ b/frontend/rust-lib/flowy-error/src/impl_from/postgres.rs@@ -0,0 +1,7 @@+use crate::FlowyError;++impl std::convert::From<tokio_postgres::Error> for FlowyError {+ fn from(error: tokio_postgres::Error) -> Self {+ FlowyError::internal().context(error)+ }+}diff --git a/frontend/rust-lib/flowy-error/src/ext/reqwest.rs b/frontend/rust-lib/flowy-error/src/impl_from/reqwest.rssimilarity index 76%rename from frontend/rust-lib/flowy-error/src/ext/reqwest.rsrename to frontend/rust-lib/flowy-error/src/impl_from/reqwest.rsindex 8bc8778b82..4fc225e936 100644--- a/frontend/rust-lib/flowy-error/src/ext/reqwest.rs+++ b/frontend/rust-lib/flowy-error/src/impl_from/reqwest.rs@@ -3,6 +3,6 @@ use reqwest::Error;impl std::convert::From<reqwest::Error> for FlowyError {fn from(error: Error) -> Self {- FlowyError::connection().context(error)+ FlowyError::http().context(error)}}diff --git a/frontend/rust-lib/flowy-error/src/ext/serde.rs b/frontend/rust-lib/flowy-error/src/impl_from/serde.rssimilarity index 100%rename from frontend/rust-lib/flowy-error/src/ext/serde.rsrename to frontend/rust-lib/flowy-error/src/impl_from/serde.rsdiff --git a/frontend/rust-lib/flowy-error/src/impl_from/tokio.rs b/frontend/rust-lib/flowy-error/src/impl_from/tokio.rsnew file mode 100644index 0000000000..a6b53132b0--- /dev/null+++ b/frontend/rust-lib/flowy-error/src/impl_from/tokio.rs@@ -0,0 +1,7 @@+use crate::FlowyError;++// impl<T> std::convert::From<tokio::sync::mpsc::error::SendError<T>> for FlowyError {+// fn from(error: tokio::sync::mpsc::error::SendError<T>) -> Self {+// FlowyError::internal().context(error)+// }+// }diff --git a/frontend/rust-lib/flowy-error/src/lib.rs b/frontend/rust-lib/flowy-error/src/lib.rsindex e0cbb86d8f..2c12adfdfc 100644--- a/frontend/rust-lib/flowy-error/src/lib.rs+++ b/frontend/rust-lib/flowy-error/src/lib.rs@@ -1,6 +1,6 @@pub mod code;mod errors;-mod ext;+mod impl_from;pub mod protobuf;pub use code::*;diff --git a/frontend/rust-lib/flowy-folder-deps/Cargo.toml b/frontend/rust-lib/flowy-folder-deps/Cargo.tomlnew file mode 100644index 0000000000..c26b04e90c--- /dev/null+++ b/frontend/rust-lib/flowy-folder-deps/Cargo.toml@@ -0,0 +1,13 @@+[package]+name = "flowy-folder-deps"+version = "0.1.0"+edition = "2021"++# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html++[dependencies]+lib-infra = { path = "../../../shared-lib/lib-infra" }+flowy-error = { path = "../flowy-error" }+collab-folder = { version = "0.1.0" }+uuid = { version = "1.3.3", features = ["v4"] }+anyhow = "1.0.71"\ No newline at end of filediff --git a/frontend/rust-lib/flowy-folder-deps/src/cloud.rs b/frontend/rust-lib/flowy-folder-deps/src/cloud.rsnew file mode 100644index 0000000000..58854b3d37--- /dev/null+++ b/frontend/rust-lib/flowy-folder-deps/src/cloud.rs@@ -0,0 +1,33 @@+pub use collab_folder::core::{Folder, FolderData, Workspace};++pub use anyhow::Error;++use lib_infra::future::FutureResult;+use uuid::Uuid;++/// [FolderCloudService] represents the cloud service for folder.+pub trait FolderCloudService: Send + Sync + 'static {+ fn create_workspace(&self, uid: i64, name: &str) -> FutureResult<Workspace, Error>;++ fn get_folder_data(&self, workspace_id: &str) -> FutureResult<Option<FolderData>, Error>;++ fn get_folder_latest_snapshot(+ &self,+ workspace_id: &str,+ ) -> FutureResult<Option<FolderSnapshot>, Error>;++ fn get_folder_updates(&self, workspace_id: &str, uid: i64) -> FutureResult<Vec<Vec<u8>>, Error>;++ fn service_name(&self) -> String;+}++pub struct FolderSnapshot {+ pub snapshot_id: i64,+ pub database_id: String,+ pub data: Vec<u8>,+ pub created_at: i64,+}++pub fn gen_workspace_id() -> Uuid {+ uuid::Uuid::new_v4()+}diff --git a/frontend/rust-lib/flowy-folder-deps/src/lib.rs b/frontend/rust-lib/flowy-folder-deps/src/lib.rsnew file mode 100644index 0000000000..1ede32218e--- /dev/null+++ b/frontend/rust-lib/flowy-folder-deps/src/lib.rs@@ -0,0 +1 @@+pub mod cloud;diff --git a/frontend/rust-lib/flowy-folder2/Cargo.toml b/frontend/rust-lib/flowy-folder2/Cargo.tomlindex 86d7fb74fd..89d339e08a 100644--- a/frontend/rust-lib/flowy-folder2/Cargo.toml+++ b/frontend/rust-lib/flowy-folder2/Cargo.toml@@ -9,13 +9,14 @@ edition = "2021"collab = { version = "0.1.0" }collab-folder = { version = "0.1.0" }appflowy-integrate = {version = "0.1.0" }+flowy-folder-deps = { path = "../flowy-folder-deps" }flowy-derive = { path = "../../../shared-lib/flowy-derive" }flowy-notification = { path = "../flowy-notification" }parking_lot = "0.12.1"unicode-segmentation = "1.10"tracing = { version = "0.1", features = ["log"] }-flowy-error = { path = "../flowy-error", features = ["adaptor_dispatch"]}+flowy-error = { path = "../flowy-error", features = ["impl_from_dispatch_error"]}lib-dispatch = { path = "../lib-dispatch" }bytes = { version = "1.4" }lib-infra = { path = "../../../shared-lib/lib-infra" }@@ -23,7 +24,6 @@ tokio = { version = "1.26", features = ["full"] }nanoid = "0.4.0"lazy_static = "1.4.0"chrono = { version = "0.4.22", default-features = false, features = ["clock"] }-strum = "0.21"strum_macros = "0.21"protobuf = {version = "2.28.0"}uuid = { version = "1.3.3", features = ["v4"] }diff --git a/frontend/rust-lib/flowy-folder2/src/deps.rs b/frontend/rust-lib/flowy-folder2/src/deps.rsdeleted file mode 100644index 23dbf01455..0000000000--- a/frontend/rust-lib/flowy-folder2/src/deps.rs+++ /dev/null@@ -1,42 +0,0 @@-use std::sync::Arc;--use appflowy_integrate::RocksCollabDB;-pub use collab_folder::core::FolderData;-pub use collab_folder::core::Workspace;--use flowy_error::FlowyError;-use lib_infra::future::FutureResult;--/// [FolderUser] represents the user for folder.-pub trait FolderUser: Send + Sync {- fn user_id(&self) -> Result<i64, FlowyError>;- fn token(&self) -> Result<Option<String>, FlowyError>;- fn collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError>;-}--/// [FolderCloudService] represents the cloud service for folder.-pub trait FolderCloudService: Send + Sync + 'static {- fn create_workspace(&self, uid: i64, name: &str) -> FutureResult<Workspace, FlowyError>;-- fn get_folder_data(&self, workspace_id: &str) -> FutureResult<Option<FolderData>, FlowyError>;-- fn get_folder_latest_snapshot(- &self,- workspace_id: &str,- ) -> FutureResult<Option<FolderSnapshot>, FlowyError>;-- fn get_folder_updates(- &self,- workspace_id: &str,- uid: i64,- ) -> FutureResult<Vec<Vec<u8>>, FlowyError>;-- fn service_name(&self) -> String;-}--pub struct FolderSnapshot {- pub snapshot_id: i64,- pub database_id: String,- pub data: Vec<u8>,- pub created_at: i64,-}diff --git a/frontend/rust-lib/flowy-folder2/src/event_handler.rs b/frontend/rust-lib/flowy-folder2/src/event_handler.rsindex 7fb733f073..cace27739a 100644--- a/frontend/rust-lib/flowy-folder2/src/event_handler.rs+++ b/frontend/rust-lib/flowy-folder2/src/event_handler.rs@@ -1,17 +1,27 @@-use std::sync::Arc;+use std::sync::{Arc, Weak};-use flowy_error::FlowyError;+use flowy_error::{FlowyError, FlowyResult};use lib_dispatch::prelude::{data_result_ok, AFPluginData, AFPluginState, DataResult};use crate::entities::*;use crate::manager::FolderManager;use crate::share::ImportParams;+fn upgrade_folder(+ folder_manager: AFPluginState<Weak<FolderManager>>,+) -> FlowyResult<Arc<FolderManager>> {+ let folder = folder_manager+ .upgrade()+ .ok_or(FlowyError::internal().context("The folder manager is already dropped"))?;+ Ok(folder)+}+#[tracing::instrument(level = "debug", skip(data, folder), err)]pub(crate) async fn create_workspace_handler(data: AFPluginData<CreateWorkspacePayloadPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<WorkspacePB, FlowyError> {+ let folder = upgrade_folder(folder)?;let params: CreateWorkspaceParams = data.into_inner().try_into()?;let workspace = folder.create_workspace(params).await?;data_result_ok(workspace.into())@@ -19,8 +29,9 @@ pub(crate) async fn create_workspace_handler(#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn get_workspace_views_handler(- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<RepeatedViewPB, FlowyError> {+ let folder = upgrade_folder(folder)?;let child_views = folder.get_current_workspace_views().await?;let repeated_view: RepeatedViewPB = child_views.into();data_result_ok(repeated_view)@@ -29,8 +40,9 @@ pub(crate) async fn get_workspace_views_handler(#[tracing::instrument(level = "debug", skip(data, folder), err)]pub(crate) async fn open_workspace_handler(data: AFPluginData<WorkspaceIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<WorkspacePB, FlowyError> {+ let folder = upgrade_folder(folder)?;let params: WorkspaceIdPB = data.into_inner();match params.value {None => Err(FlowyError::workspace_id().context("workspace id should not be empty")),@@ -50,8 +62,9 @@ pub(crate) async fn open_workspace_handler(#[tracing::instrument(level = "debug", skip(data, folder), err)]pub(crate) async fn read_workspaces_handler(data: AFPluginData<WorkspaceIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<RepeatedWorkspacePB, FlowyError> {+ let folder = upgrade_folder(folder)?;let params: WorkspaceIdPB = data.into_inner();let workspaces = match params.value {None => folder.get_all_workspaces().await,@@ -67,8 +80,9 @@ pub(crate) async fn read_workspaces_handler(#[tracing::instrument(level = "debug", skip(folder), err)]pub async fn get_current_workspace_setting_handler(- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<WorkspaceSettingPB, FlowyError> {+ let folder = upgrade_folder(folder)?;let workspace = folder.get_current_workspace().await?;let latest_view: Option<ViewPB> = folder.get_current_view().await;data_result_ok(WorkspaceSettingPB {@@ -79,8 +93,9 @@ pub async fn get_current_workspace_setting_handler(pub(crate) async fn create_view_handler(data: AFPluginData<CreateViewPayloadPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<ViewPB, FlowyError> {+ let folder = upgrade_folder(folder)?;let params: CreateViewParams = data.into_inner().try_into()?;let set_as_current = params.set_as_current;let view = folder.create_view_with_params(params).await?;@@ -92,8 +107,9 @@ pub(crate) async fn create_view_handler(pub(crate) async fn create_orphan_view_handler(data: AFPluginData<CreateOrphanViewPayloadPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<ViewPB, FlowyError> {+ let folder = upgrade_folder(folder)?;let params: CreateViewParams = data.into_inner().try_into()?;let set_as_current = params.set_as_current;let view = folder.create_orphan_view_with_params(params).await?;@@ -105,8 +121,9 @@ pub(crate) async fn create_orphan_view_handler(pub(crate) async fn read_view_handler(data: AFPluginData<ViewIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<ViewPB, FlowyError> {+ let folder = upgrade_folder(folder)?;let view_id: ViewIdPB = data.into_inner();let view_pb = folder.get_view(&view_id.value).await?;data_result_ok(view_pb)@@ -115,8 +132,9 @@ pub(crate) async fn read_view_handler(#[tracing::instrument(level = "debug", skip(data, folder), err)]pub(crate) async fn update_view_handler(data: AFPluginData<UpdateViewPayloadPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let params: UpdateViewParams = data.into_inner().try_into()?;folder.update_view_with_params(params).await?;Ok(())@@ -124,8 +142,9 @@ pub(crate) async fn update_view_handler(pub(crate) async fn delete_view_handler(data: AFPluginData<RepeatedViewIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let params: RepeatedViewIdPB = data.into_inner();for view_id in ¶ms.items {let _ = folder.move_view_to_trash(view_id).await;@@ -135,8 +154,9 @@ pub(crate) async fn delete_view_handler(pub(crate) async fn set_latest_view_handler(data: AFPluginData<ViewIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let view_id: ViewIdPB = data.into_inner();let _ = folder.set_current_view(&view_id.value).await;Ok(())@@ -144,8 +164,9 @@ pub(crate) async fn set_latest_view_handler(pub(crate) async fn close_view_handler(data: AFPluginData<ViewIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let view_id: ViewIdPB = data.into_inner();let _ = folder.close_view(&view_id.value).await;Ok(())@@ -154,8 +175,9 @@ pub(crate) async fn close_view_handler(#[tracing::instrument(level = "debug", skip_all, err)]pub(crate) async fn move_view_handler(data: AFPluginData<MoveViewPayloadPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let params: MoveViewParams = data.into_inner().try_into()?;folder.move_view(¶ms.view_id, params.from, params.to)@@ -165,8 +187,9 @@ pub(crate) async fn move_view_handler(pub(crate) async fn move_nested_view_handler(data: AFPluginData<MoveNestedViewPayloadPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let params: MoveNestedViewParams = data.into_inner().try_into()?;folder.move_nested_view(params.view_id, params.new_parent_id, params.prev_view_id)@@ -177,8 +200,9 @@ pub(crate) async fn move_nested_view_handler(#[tracing::instrument(level = "debug", skip(data, folder), err)]pub(crate) async fn duplicate_view_handler(data: AFPluginData<ViewPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let view: ViewPB = data.into_inner();folder.duplicate_view(&view.id).await?;Ok(())@@ -186,8 +210,9 @@ pub(crate) async fn duplicate_view_handler(#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn read_trash_handler(- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<RepeatedTrashPB, FlowyError> {+ let folder = upgrade_folder(folder)?;let trash = folder.get_all_trash().await;data_result_ok(trash.into())}@@ -195,8 +220,9 @@ pub(crate) async fn read_trash_handler(#[tracing::instrument(level = "debug", skip(identifier, folder), err)]pub(crate) async fn putback_trash_handler(identifier: AFPluginData<TrashIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;folder.restore_trash(&identifier.id).await;Ok(())}@@ -204,8 +230,9 @@ pub(crate) async fn putback_trash_handler(#[tracing::instrument(level = "debug", skip(identifiers, folder), err)]pub(crate) async fn delete_trash_handler(identifiers: AFPluginData<RepeatedTrashIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let trash_ids = identifiers.into_inner().items;for trash_id in trash_ids {let _ = folder.delete_trash(&trash_id.id).await;@@ -215,16 +242,18 @@ pub(crate) async fn delete_trash_handler(#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn restore_all_trash_handler(- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;folder.restore_all_trash().await;Ok(())}#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn delete_all_trash_handler(- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;folder.delete_all_trash().await;Ok(())}@@ -232,8 +261,9 @@ pub(crate) async fn delete_all_trash_handler(#[tracing::instrument(level = "debug", skip(data, folder), err)]pub(crate) async fn import_data_handler(data: AFPluginData<ImportPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> Result<(), FlowyError> {+ let folder = upgrade_folder(folder)?;let params: ImportParams = data.into_inner().try_into()?;folder.import(params).await?;Ok(())@@ -242,8 +272,9 @@ pub(crate) async fn import_data_handler(#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn get_folder_snapshots_handler(data: AFPluginData<WorkspaceIdPB>,- folder: AFPluginState<Arc<FolderManager>>,+ folder: AFPluginState<Weak<FolderManager>>,) -> DataResult<RepeatedFolderSnapshotPB, FlowyError> {+ let folder = upgrade_folder(folder)?;if let Some(workspace_id) = &data.value {let snapshots = folder.get_folder_snapshots(workspace_id).await?;data_result_ok(RepeatedFolderSnapshotPB { items: snapshots })diff --git a/frontend/rust-lib/flowy-folder2/src/event_map.rs b/frontend/rust-lib/flowy-folder2/src/event_map.rsindex c9cba068d3..3d3eceecd3 100644--- a/frontend/rust-lib/flowy-folder2/src/event_map.rs+++ b/frontend/rust-lib/flowy-folder2/src/event_map.rs@@ -1,4 +1,4 @@-use std::sync::Arc;+use std::sync::Weak;use strum_macros::Display;@@ -8,7 +8,7 @@ use lib_dispatch::prelude::*;use crate::event_handler::*;use crate::manager::FolderManager;-pub fn init(folder: Arc<FolderManager>) -> AFPlugin {+pub fn init(folder: Weak<FolderManager>) -> AFPlugin {AFPlugin::new().name("Flowy-Folder").state(folder)// Workspace.event(FolderEvent::CreateWorkspace, create_workspace_handler)diff --git a/frontend/rust-lib/flowy-folder2/src/lib.rs b/frontend/rust-lib/flowy-folder2/src/lib.rsindex 65741a4d43..2e5df210ca 100644--- a/frontend/rust-lib/flowy-folder2/src/lib.rs+++ b/frontend/rust-lib/flowy-folder2/src/lib.rs@@ -1,16 +1,14 @@+pub use collab_folder::core::ViewLayout;+pub mod entities;pub mod event_handler;pub mod event_map;pub mod manager;-mod notification;+pub mod notification;pub mod protobuf;mod user_default;pub mod view_operation;-pub mod deps;pub mod share;#[cfg(feature = "test_helper")]mod test_helper;--pub use collab_folder::core::ViewLayout;-pub use user_default::gen_workspace_id;diff --git a/frontend/rust-lib/flowy-folder2/src/manager.rs b/frontend/rust-lib/flowy-folder2/src/manager.rsindex d068fa316c..15c59d0f77 100644--- a/frontend/rust-lib/flowy-folder2/src/manager.rs+++ b/frontend/rust-lib/flowy-folder2/src/manager.rs@@ -3,7 +3,7 @@ use std::ops::Deref;use std::sync::{Arc, Weak};use appflowy_integrate::collab_builder::AppFlowyCollabBuilder;-use appflowy_integrate::{CollabPersistenceConfig, RocksCollabDB};+use appflowy_integrate::{CollabPersistenceConfig, CollabType, RocksCollabDB};use collab::core::collab::{CollabRawData, MutexCollab};use collab::core::collab_state::SyncState;use collab_folder::core::{@@ -16,8 +16,8 @@ use tokio_stream::StreamExt;use tracing::{event, Level};use flowy_error::{ErrorCode, FlowyError, FlowyResult};+use flowy_folder_deps::cloud::FolderCloudService;-use crate::deps::{FolderCloudService, FolderUser};use crate::entities::{view_pb_with_child_views, view_pb_without_child_views, ChildViewUpdatePB, CreateViewParams,CreateWorkspaceParams, DeletedViewPB, FolderSnapshotPB, FolderSnapshotStatePB, FolderSyncStatePB,@@ -33,6 +33,13 @@ use crate::view_operation::{create_view, gen_view_id, FolderOperationHandler, FolderOperationHandlers,};+/// [FolderUser] represents the user for folder.+pub trait FolderUser: 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>;+}+pub struct FolderManager {mutex_folder: Arc<MutexFolder>,collab_builder: Arc<AppFlowyCollabBuilder>,@@ -172,13 +179,13 @@ impl FolderManager {&self,uid: i64,workspace_id: &str,- collab_db: Arc<RocksCollabDB>,+ collab_db: Weak<RocksCollabDB>,raw_data: CollabRawData,) -> Result<Arc<MutexCollab>, FlowyError> {let collab = self.collab_builder.build_with_config(uid,workspace_id,- "workspace",+ CollabType::Folder,collab_db,raw_data,&CollabPersistenceConfig::new().enable_snapshot(true),@@ -186,8 +193,14 @@ impl FolderManager {Ok(collab)}+ /// Initialize the folder with the given workspace id.+ /// Fetch the folder updates from the cloud service and initialize the folder.#[tracing::instrument(level = "debug", skip(self, user_id), err)]- pub async fn initialize_when_sign_in(&self, user_id: i64, workspace_id: &str) -> FlowyResult<()> {+ pub async fn initialize_with_workspace_id(+ &self,+ user_id: i64,+ workspace_id: &str,+ ) -> FlowyResult<()> {let folder_updates = self.cloud_service.get_folder_updates(workspace_id, user_id)@@ -209,7 +222,9 @@ impl FolderManager {Ok(())}- pub async fn initialize_when_sign_up(+ /// Initialize the folder for the new user.+ /// Using the [DefaultFolderBuilder] to create the default workspace for the new user.+ pub async fn initialize_with_new_user(&self,user_id: i64,_token: &str,@@ -239,11 +254,6 @@ impl FolderManager {FolderInitializeData::Data(folder_data),).await?;- // send_notification(token, FolderNotification::DidCreateWorkspace)- // .payload(RepeatedWorkspacePB {- // items: vec![workspace_pb],- // })- // .send();} else {// The folder data is loaded through the [FolderCloudService]. If the cloud service in use is// [LocalServerFolderCloudServiceImpl], the folder data will be None because the Folder will load@@ -310,6 +320,15 @@ impl FolderManager {self.with_folder(None, |folder| folder.workspaces.get_workspace(workspace_id))}+ async fn get_current_workspace_id(&self) -> FlowyResult<String> {+ self+ .mutex_folder+ .lock()+ .as_ref()+ .and_then(|folder| folder.get_current_workspace_id())+ .ok_or(FlowyError::internal().context("Unexpected empty workspace id"))+ }+fn with_folder<F, Output>(&self, default_value: Output, f: F) -> OutputwhereF: FnOnce(&Folder) -> Output,@@ -327,6 +346,7 @@ impl FolderManager {pub async fn create_view_with_params(&self, params: CreateViewParams) -> FlowyResult<View> {let view_layout: ViewLayout = params.layout.clone().into();+ let _workspace_id = self.get_current_workspace_id().await?;let handler = self.get_handler(&view_layout)?;let user_id = self.user.user_id()?;let meta = params.meta.clone();@@ -380,13 +400,10 @@ impl FolderManager {#[tracing::instrument(level = "debug", skip(self), err)]pub(crate) async fn close_view(&self, view_id: &str) -> Result<(), FlowyError> {- let view = self- .with_folder(None, |folder| folder.views.get_view(view_id))- .ok_or_else(|| {- FlowyError::record_not_found().context("Can't find the view when closing the view")- })?;- let handler = self.get_handler(&view.layout)?;- handler.close_view(view_id).await?;+ if let Some(view) = self.with_folder(None, |folder| folder.views.get_view(view_id)) {+ let handler = self.get_handler(&view.layout)?;+ handler.close_view(view_id).await?;+ }Ok(())}diff --git a/frontend/rust-lib/flowy-folder2/src/notification.rs b/frontend/rust-lib/flowy-folder2/src/notification.rsindex e531fa2fcf..878b33b134 100644--- a/frontend/rust-lib/flowy-folder2/src/notification.rs+++ b/frontend/rust-lib/flowy-folder2/src/notification.rs@@ -11,7 +11,7 @@ use crate::entities::{view_pb_without_child_views, WorkspacePB, WorkspaceSettingconst FOLDER_OBSERVABLE_SOURCE: &str = "Workspace";#[derive(ProtoBuf_Enum, Debug, Default)]-pub(crate) enum FolderNotification {+pub enum FolderNotification {#[default]Unknown = 0,/// Trigger after creating a workspacediff --git a/frontend/rust-lib/flowy-folder2/src/user_default.rs b/frontend/rust-lib/flowy-folder2/src/user_default.rsindex f854123b7c..3e411d2cad 100644--- a/frontend/rust-lib/flowy-folder2/src/user_default.rs+++ b/frontend/rust-lib/flowy-folder2/src/user_default.rs@@ -59,10 +59,6 @@ impl DefaultFolderBuilder {}}-pub fn gen_workspace_id() -> String {- uuid::Uuid::new_v4().to_string()-}-impl From<&ParentChildViews> for ViewPB {fn from(value: &ParentChildViews) -> Self {view_pb_with_child_views(diff --git a/frontend/rust-lib/flowy-folder2/tests/workspace/script.rs b/frontend/rust-lib/flowy-folder2/tests/workspace/script.rsindex b5854f1441..bee8b92828 100644--- a/frontend/rust-lib/flowy-folder2/tests/workspace/script.rs+++ b/frontend/rust-lib/flowy-folder2/tests/workspace/script.rs@@ -274,16 +274,19 @@ pub async fn move_view(parent_id: String,prev_view_id: Option<String>,) {- let request = MoveNestedViewPayloadPB {+ let payload = MoveNestedViewPayloadPB {view_id,new_parent_id: parent_id,prev_view_id,};- EventBuilder::new(sdk.clone())+ let error = EventBuilder::new(sdk.clone()).event(MoveNestedView)- .payload(request)+ .payload(payload).async_send()- .await;+ .await+ .error();++ assert!(error.is_none());}pub async fn update_view(sdk: &FlowyCoreTest,diff --git a/frontend/rust-lib/flowy-net/Cargo.toml b/frontend/rust-lib/flowy-net/Cargo.tomlindex 23e52ec7bb..7494f35238 100644--- a/frontend/rust-lib/flowy-net/Cargo.toml+++ b/frontend/rust-lib/flowy-net/Cargo.toml@@ -7,25 +7,18 @@ edition = "2018"[dependencies]lib-dispatch = { path = "../lib-dispatch" }-flowy-error = { path = "../flowy-error", features = ["adaptor_reqwest", "adaptor_server_error"] }-flowy-derive = { path = "../../../shared-lib/flowy-derive" }protobuf = {version = "2.28.0"}-anyhow = "1.0"-thiserror = "1.0"bytes = { version = "1.4" }-strum_macros = "0.21"tracing = { version = "0.1"}[features]http_server = []dart = ["flowy-codegen/dart",- "flowy-error/dart",]ts = ["flowy-codegen/ts",- "flowy-error/ts",][build-dependencies]diff --git a/frontend/rust-lib/flowy-net/build.rs b/frontend/rust-lib/flowy-net/build.rsindex 06388d2a02..0f8949d3e5 100644--- a/frontend/rust-lib/flowy-net/build.rs+++ b/frontend/rust-lib/flowy-net/build.rs@@ -1,10 +1,10 @@fn main() {- let crate_name = env!("CARGO_PKG_NAME");- flowy_codegen::protobuf_file::gen(crate_name);-- #[cfg(feature = "dart")]- flowy_codegen::dart_event::gen(crate_name);-- #[cfg(feature = "ts")]- flowy_codegen::ts_event::gen(crate_name);+ // let crate_name = env!("CARGO_PKG_NAME");+ // flowy_codegen::protobuf_file::gen(crate_name);+ //+ // #[cfg(feature = "dart")]+ // flowy_codegen::dart_event::gen(crate_name);+ //+ // #[cfg(feature = "ts")]+ // flowy_codegen::ts_event::gen(crate_name);}diff --git a/frontend/rust-lib/flowy-net/src/entities/network_state.rs b/frontend/rust-lib/flowy-net/src/entities/network_state.rsindex 4b31d2f595..2be6434015 100644--- a/frontend/rust-lib/flowy-net/src/entities/network_state.rs+++ b/frontend/rust-lib/flowy-net/src/entities/network_state.rs@@ -1,29 +1,29 @@-use flowy_derive::{ProtoBuf, ProtoBuf_Enum};--#[derive(ProtoBuf_Enum, Debug, Clone, Eq, PartialEq, Default)]-pub enum NetworkTypePB {- #[default]- Unknown = 0,- Wifi = 1,- Cell = 2,- Ethernet = 3,- Bluetooth = 4,- VPN = 5,-}--impl NetworkTypePB {- pub fn is_connect(&self) -> bool {- match self {- NetworkTypePB::Unknown | NetworkTypePB::Bluetooth => false,- NetworkTypePB::Wifi | NetworkTypePB::Cell | NetworkTypePB::Ethernet | NetworkTypePB::VPN => {- true- },- }- }-}--#[derive(ProtoBuf, Debug, Default, Clone)]-pub struct NetworkStatePB {- #[pb(index = 1)]- pub ty: NetworkTypePB,-}+// use flowy_derive::{ProtoBuf, ProtoBuf_Enum};+//+// #[derive(ProtoBuf_Enum, Debug, Clone, Eq, PartialEq, Default)]+// pub enum NetworkTypePB {+// #[default]+// Unknown = 0,+// Wifi = 1,+// Cell = 2,+// Ethernet = 3,+// Bluetooth = 4,+// VPN = 5,+// }+//+// impl NetworkTypePB {+// pub fn is_connect(&self) -> bool {+// match self {+// NetworkTypePB::Unknown | NetworkTypePB::Bluetooth => false,+// NetworkTypePB::Wifi | NetworkTypePB::Cell | NetworkTypePB::Ethernet | NetworkTypePB::VPN => {+// true+// },+// }+// }+// }+//+// #[derive(ProtoBuf, Debug, Default, Clone)]+// pub struct NetworkStatePB {+// #[pb(index = 1)]+// pub ty: NetworkTypePB,+// }diff --git a/frontend/rust-lib/flowy-net/src/event_map.rs b/frontend/rust-lib/flowy-net/src/event_map.rsindex 2081d49510..968b49c9df 100644--- a/frontend/rust-lib/flowy-net/src/event_map.rs+++ b/frontend/rust-lib/flowy-net/src/event_map.rs@@ -1,19 +1,5 @@-use strum_macros::Display;--use flowy_derive::{Flowy_Event, ProtoBuf_Enum};use lib_dispatch::prelude::*;-use crate::handlers::*;-pub fn init() -> AFPlugin {- AFPlugin::new()- .name("Flowy-Network")- .event(NetworkEvent::UpdateNetworkType, update_network_ty)-}--#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]-#[event_err = "FlowyError"]-pub enum NetworkEvent {- #[event(input = "NetworkStatePB")]- UpdateNetworkType = 0,+ AFPlugin::new().name("Flowy-Network")}diff --git a/frontend/rust-lib/flowy-net/src/handlers/mod.rs b/frontend/rust-lib/flowy-net/src/handlers/mod.rsindex 6bd3486929..c7b715c332 100644--- a/frontend/rust-lib/flowy-net/src/handlers/mod.rs+++ b/frontend/rust-lib/flowy-net/src/handlers/mod.rs@@ -1,8 +1,3 @@-use flowy_error::FlowyError;-use lib_dispatch::prelude::AFPluginData;--use crate::entities::NetworkStatePB;--pub async fn update_network_ty(_data: AFPluginData<NetworkStatePB>) -> Result<(), FlowyError> {- Ok(())-}+// pub async fn update_network_ty(_data: AFPluginData<NetworkStatePB>) -> Result<(), FlowyError> {+// Ok(())+// }diff --git a/frontend/rust-lib/flowy-net/src/lib.rs b/frontend/rust-lib/flowy-net/src/lib.rsindex 9e3de4ba43..0cbe80f4e4 100644--- a/frontend/rust-lib/flowy-net/src/lib.rs+++ b/frontend/rust-lib/flowy-net/src/lib.rs@@ -1,4 +1,3 @@pub mod entities;pub mod event_map;mod handlers;-pub mod protobuf;diff --git a/frontend/rust-lib/flowy-server-config/src/supabase_config.rs b/frontend/rust-lib/flowy-server-config/src/supabase_config.rsindex 677643ea7b..ce328fac96 100644--- a/frontend/rust-lib/flowy-server-config/src/supabase_config.rs+++ b/frontend/rust-lib/flowy-server-config/src/supabase_config.rs@@ -5,7 +5,6 @@ use flowy_error::{ErrorCode, FlowyError};pub const ENABLE_SUPABASE_SYNC: &str = "ENABLE_SUPABASE_SYNC";pub const SUPABASE_URL: &str = "SUPABASE_URL";pub const SUPABASE_ANON_KEY: &str = "SUPABASE_ANON_KEY";-pub const SUPABASE_KEY: &str = "SUPABASE_KEY";pub const SUPABASE_JWT_SECRET: &str = "SUPABASE_JWT_SECRET";pub const SUPABASE_DB: &str = "SUPABASE_DB";@@ -13,44 +12,38 @@ pub const SUPABASE_DB_USER: &str = "SUPABASE_DB_USER";pub const SUPABASE_DB_PASSWORD: &str = "SUPABASE_DB_PASSWORD";pub const SUPABASE_DB_PORT: &str = "SUPABASE_DB_PORT";+/// The configuration for the postgres database. It supports deserializing from the json string that+/// passed from the frontend application. [AppFlowyEnv::parser]#[derive(Debug, Serialize, Deserialize, Clone, Default)]pub struct SupabaseConfiguration {/// The url of the supabase server.pub url: String,-/// The key of the supabase server.- pub key: String,+ pub anon_key: String,/// The secret used to sign the JWT tokens.pub jwt_secret: String,-+ /// Whether to enable the supabase sync.+ /// User can disable it by injecting the environment variable ENABLE_SUPABASE_SYNC=falsepub enable_sync: bool,-- pub postgres_config: PostgresConfiguration,}impl SupabaseConfiguration {- /// Load the configuration from the environment variables.- /// SUPABASE_URL=https://<your-supabase-url>.supabase.co- /// SUPABASE_KEY=<your-supabase-key>- /// SUPABASE_JWT_SECRET=<your-supabase-jwt-secret>- ///pub fn from_env() -> Result<Self, FlowyError> {- let postgres_config = PostgresConfiguration::from_env()?;Ok(Self {enable_sync: std::env::var(ENABLE_SUPABASE_SYNC).map(|v| v == "true").unwrap_or(false),url: std::env::var(SUPABASE_URL).map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_URL"))?,- key: std::env::var(SUPABASE_KEY)- .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_KEY"))?,+ anon_key: std::env::var(SUPABASE_ANON_KEY)+ .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_ANON_KEY"))?,jwt_secret: std::env::var(SUPABASE_JWT_SECRET).map_err(|_| {FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_JWT_SECRET")})?,- postgres_config,})}+ /// Write the configuration to the environment variables.pub fn write_env(&self) {if self.enable_sync {std::env::set_var(ENABLE_SUPABASE_SYNC, "true");@@ -58,45 +51,7 @@ impl SupabaseConfiguration {std::env::set_var(ENABLE_SUPABASE_SYNC, "false");}std::env::set_var(SUPABASE_URL, &self.url);- std::env::set_var(SUPABASE_KEY, &self.key);+ std::env::set_var(SUPABASE_ANON_KEY, &self.anon_key);std::env::set_var(SUPABASE_JWT_SECRET, &self.jwt_secret);- self.postgres_config.write_env();- }-}--#[derive(Debug, Default, Clone, Serialize, Deserialize)]-pub struct PostgresConfiguration {- pub url: String,- pub user_name: String,- pub password: String,- pub port: u16,-}--impl PostgresConfiguration {- pub fn from_env() -> Result<Self, FlowyError> {- let url = std::env::var(SUPABASE_DB)- .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_DB"))?;- let user_name = std::env::var(SUPABASE_DB_USER)- .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_DB_USER"))?;- let password = std::env::var(SUPABASE_DB_PASSWORD)- .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_DB_PASSWORD"))?;- let port = std::env::var(SUPABASE_DB_PORT)- .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_DB_PORT"))?- .parse::<u16>()- .map_err(|_e| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_DB_PORT"))?;-- Ok(Self {- url,- user_name,- password,- port,- })- }-- pub fn write_env(&self) {- std::env::set_var(SUPABASE_DB, &self.url);- std::env::set_var(SUPABASE_DB_USER, &self.user_name);- std::env::set_var(SUPABASE_DB_PASSWORD, &self.password);- std::env::set_var(SUPABASE_DB_PORT, self.port.to_string());}}diff --git a/frontend/rust-lib/flowy-server/Cargo.toml b/frontend/rust-lib/flowy-server/Cargo.tomlindex 39a625f06b..339cdb6418 100644--- a/frontend/rust-lib/flowy-server/Cargo.toml+++ b/frontend/rust-lib/flowy-server/Cargo.toml@@ -7,6 +7,7 @@ edition = "2021"[dependencies]tracing = { version = "0.1" }+futures = "0.3.26"futures-util = "0.3.26"reqwest = "0.11.14"hyper = "0.14"@@ -14,40 +15,31 @@ config = { version = "0.10.1", default-features = false, features = ["yaml"] }serde = { version = "1.0", features = ["derive"] }serde_json = "1.0"serde-aux = "4.2.0"-nanoid = "0.4.0"thiserror = "1.0"tokio = { version = "1.26", features = ["sync"]}parking_lot = "0.12"lazy_static = "1.4.0"-bytes = "1.0.1"+bytes = { version = "1.0.1", features = ["serde"] }tokio-retry = "0.3"anyhow = "1.0"uuid = { version = "1.3.3", features = ["v4"] }chrono = { version = "0.4.22", default-features = false, features = ["clock"] }-appflowy-integrate = { version = "0.1.0" }-+collab = { version = "0.1.0" }+collab-plugins = { version = "0.1.0" }+collab-document = { version = "0.1.0" }+hex = "0.4.3"postgrest = "1.0"-tokio-postgres = { version = "0.7.8", optional = true, features = ["with-uuid-1","with-chrono-0_4"] }-deadpool-postgres = "0.10.5"-refinery= { version = "0.8.10", optional = true, features = ["tokio-postgres"] }-async-stream = "0.3.4"-futures = "0.3.26"-lib-infra = { path = "../../../shared-lib/lib-infra" }-flowy-user = { path = "../flowy-user" }-flowy-folder2 = { path = "../flowy-folder2" }-flowy-database2 = { path = "../flowy-database2" }-flowy-document2 = { path = "../flowy-document2" }-flowy-error = { path = "../flowy-error" }+flowy-user-deps = { path = "../flowy-user-deps" }+flowy-folder-deps = { path = "../flowy-folder-deps" }+flowy-database-deps = { path = "../flowy-database-deps" }+flowy-document-deps = { path = "../flowy-document-deps" }+flowy-error = { path = "../flowy-error", features = ["impl_from_postgres", "impl_from_serde", "impl_from_reqwest"] }flowy-server-config = { path = "../flowy-server-config" }-collab-folder = { version = "0.1.0" }-collab-document = { version = "0.1.0" }[dev-dependencies]uuid = { version = "1.3.3", features = ["v4"] }tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }dotenv = "0.15.0"+yrs = "0.16.5"-[features]-default = ["postgres_storage"]-postgres_storage = ["tokio-postgres", "refinery", ]diff --git a/frontend/rust-lib/flowy-server/docs/README.md b/frontend/rust-lib/flowy-server/docs/README.mdnew file mode 100644index 0000000000..f98361ee6e--- /dev/null+++ b/frontend/rust-lib/flowy-server/docs/README.md@@ -0,0 +1,108 @@+# AppFlowy Cloud Architecture++AppFlowy supports multiple cloud solutions. Users can choose their preferred cloud provider, such as Supabase, Firebase,+AWS, or our own AppFlowyCloud (Self-hosted server).++++## Design++AppFlowy use the traits [AppFlowyServer] to abstract the cloud provider. Each cloud provider implements the [AppFlowyServer]+trait. As the image below shows. Users can choose their preferred cloud provider or simply use the default option, which is the LocalServer. When using the+LocalServer, data is stored on the local file system. Users can migrate to a cloud provider if needed. For instance, one+could migrate from LocalServer to AppFlowyCloud. This migration would create a new user in the cloud and transfer all the+data from the local database to the cloud.++++## AppFlowy Cloud Implementation (WIP)++### Restful API++### Table schema++## Supabase Implementation++### Table schema+++1. `af_roles` table: This table contains a list of roles that are used in your application, such as 'Owner', 'Member', and 'Guest'.++2. `af_permissions` table: This table stores permissions that are used in your application. Each permission has a name, a description, and an access level.++3. `af_role_permissions` table: This is a many-to-many relation table between roles and permissions. It represents which permissions a role has.++4. `af_user` table: This stores the details of users like uuid, email, uid, name, created_at. Here, uid is an auto-incrementing integer that uniquely identifies a user.++5. `af_workspace` table: This table contains all the workspaces. Each workspace has an owner which is associated with the uid of a user in the `af_user` table.++6. `af_workspace_member` table: This table maintains a list of all the members associated with a workspace and their roles.++7. `af_collab` and `af_collab_member` tables: These tables store the collaborations and their members respectively. Each collaboration has an owner and a workspace associated with it.++8. `af_collab_update`, `af_collab_update_document`, `af_collab_update_database`, `af_collab_update_w_database`, `af_collab_update_folder`, `af_database_row_update` tables: These tables are used for handling updates to collaborations.++9. `af_collab_statistics`, `af_collab_snapshot`, `af_collab_state`: These tables and view are used for maintaining statistics and snapshots of collaborations.++10. `af_user_profile_view` view: This view is used to get the latest workspace_id for each user.+++Here's a detailed description for each of these triggers:++1. `create_af_workspace_trigger`:++ This trigger is designed to automate the process of workspace creation in the `af_workspace` table after a new user is inserted into the `af_user` table. When a new user is added, this trigger fires and inserts a new record into the `af_workspace` table, setting the `owner_uid` to the UID of the new user.++2. `manage_af_workspace_member_role_trigger`:++ This trigger helps to manage the roles of workspace members. After an insert operation on the `af_workspace` table, this trigger automatically fires and creates a new record in the `af_workspace_member` table. The new record identifies the user as a member of the workspace with the role 'Owner'. This ensures that every new workspace has an owner.++3. `insert_into_af_collab_trigger`:++ The purpose of this trigger is to ensure consistency between the `af_collab_update` and `af_collab` tables. When an insert operation is about to be performed on the `af_collab_update` table, this trigger fires before the insert operation. It checks if a corresponding collaboration exists in the `af_collab` table using the oid and uid. If a corresponding collaboration does not exist, the trigger creates one, using the oid, uid, and current timestamp. This way, every collab update operation corresponds to a valid collaboration.++4. `insert_into_af_collab_member_trigger`:++ This trigger helps to manage the membership of users in collaborations. After a new collaboration is inserted into the `af_collab` table, this trigger fires. It checks if a corresponding collaboration member exists in the `af_collab_member` table. If a corresponding member does not exist, the trigger creates one, using the collaboration id and user id. This ensures that every collaboration has at least one member.++5. `af_collab_snapshot_update_edit_count_trigger`:++ This trigger is designed to keep track of the number of edits on each collaboration snapshot in the `af_collab_snapshot` table. When an update operation is performed on the `af_collab_snapshot` table, this trigger fires. It increments the `edit_count` of the corresponding record in the `af_collab_snapshot` table by one. This ensures that the application can keep track of how many times each collaboration snapshot has been edited.+++### Supabase configuration++#### Test+In order to run the test, you need to set up the .env.test file.+```dotenv+# Supabase configuration+SUPABASE_URL="your-supabase-url"+SUPABASE_ANON_KEY="your-supabase-anonymous-key"+SUPABASE_KEY="your-supabase-key"+SUPABASE_JWT_SECRET="your-supabase-jwt-secret"++# Supabase Database configuration+SUPABASE_DB="your-supabase-db-url"+SUPABASE_DB_USER="your-db-username"+SUPABASE_DB_PORT="your-db-port"+SUPABASE_DB_PASSWORD="your-db-password"+```++1. `SUPABASE_URL`: This is the URL of your Supabase server instance. Your application will use this URL to interact with the Supabase service.++2. `SUPABASE_ANON_KEY`: This is the anonymous API key from Supabase, used for operations that don't require user authentication. Operations performed with this key are done as the anonymous role in the database.++3. `SUPABASE_KEY`: This is the API key with higher privileges from Supabase. It is generally used for server-side operations that require more permissions than an anonymous user.++4. `SUPABASE_JWT_SECRET`: This is the secret used to verify JWT tokens generated by Supabase. JWT or JSON Web Token is a standard method for securely transferring data between parties as a JSON object.++5. `SUPABASE_DB`: This is the URL for the database your Supabase server instance is using.++6. `SUPABASE_DB_USER`: This is the username used to authenticate with the Supabase database, in this case, it's 'postgres', which is a common default for PostgreSQL.++7. `SUPABASE_DB_PORT`: This is the port number where your Supabase database service is accessible. The default PostgreSQL port is 5432, and you are using this default port.++8. `SUPABASE_DB_PASSWORD`: This is the password used to authenticate the `SUPABASE_DB_USER` with the Supabase database.++For example, if you want to run the supabase tests located in flowy-test crate. You need to put the `.env.test` file under+the flowy-test folder.\ No newline at end of filediff --git a/frontend/rust-lib/flowy-server/docs/architecture-Application.png b/frontend/rust-lib/flowy-server/docs/architecture-Application.pngnew file mode 100644index 0000000000..f580f246eaBinary files /dev/null and b/frontend/rust-lib/flowy-server/docs/architecture-Application.png differdiff --git a/frontend/rust-lib/flowy-server/docs/architecture.plantuml b/frontend/rust-lib/flowy-server/docs/architecture.plantumlnew file mode 100644index 0000000000..608aa5ddcd--- /dev/null+++ b/frontend/rust-lib/flowy-server/docs/architecture.plantuml@@ -0,0 +1,78 @@+@startuml+title "Application"+left to right direction+package "AppFlowy Application" {+ [User]+}++cloud "Supabase Server" {+ [RESTful Component]+ [Realtime Component]+ [Postgres DB]+}++database "LocalServer" {+ [Local Server Component]+}+++cloud "AppFlowy Cloud Server" {+ [RESTful Component] as [AppFlowy RESTful Component]+ [Realtime Component] as [AppFlowy Realtime Component]+ [Postgres DB] as [AppFlowy Postgres DB]+}++User --> [AppFlowy Application]+[AppFlowy Application] --> [Local Server Component] : Connect++[AppFlowy Application] --> [RESTful Component] : RESTful API Communication+[AppFlowy Application] <..> [Realtime Component] : WebSocket Communication++[AppFlowy Application] --> [AppFlowy RESTful Component] : RESTful API Communication+[AppFlowy Application] <..> [AppFlowy Realtime Component] : WebSocket Communication++@enduml+++@startuml+left to right direction++interface AppFlowyServer {+ + enable_sync(_enable: bool)+ + user_service(): Arc<dyn UserService>+ + folder_service(): Arc<dyn FolderCloudService>+ + database_service(): Arc<dyn DatabaseCloudService>+ + document_service(): Arc<dyn DocumentCloudService>+ + collab_storage(): Option<Arc<dyn RemoteCollabStorage>>+}++class SupabaseServer {+ + enable_sync(_enable: bool)+ + user_service(): Arc<dyn UserService>+ + folder_service(): Arc<dyn FolderCloudService>+ + database_service(): Arc<dyn DatabaseCloudService>+ + document_service(): Arc<dyn DocumentCloudService>+ + collab_storage(): Option<Arc<dyn RemoteCollabStorage>>+}++class SelfHostServer {+ + user_service(): Arc<dyn UserService>+ + folder_service(): Arc<dyn FolderCloudService>+ + database_service(): Arc<dyn DatabaseCloudService>+ + document_service(): Arc<dyn DocumentCloudService>+ + collab_storage(): Option<Arc<dyn RemoteCollabStorage>>+}++class LocalServer {+ + user_service(): Arc<dyn UserService>+ + folder_service(): Arc<dyn FolderCloudService>+ + database_service(): Arc<dyn DatabaseCloudService>+ + document_service(): Arc<dyn DocumentCloudService>+ + collab_storage(): Option<Arc<dyn RemoteCollabStorage>>+}++SupabaseServer -u-|> AppFlowyServer+SelfHostServer -u-|> AppFlowyServer+LocalServer -u-|> AppFlowyServer++@endumldiff --git a/frontend/rust-lib/flowy-server/docs/architecture.png b/frontend/rust-lib/flowy-server/docs/architecture.pngnew file mode 100644index 0000000000..f6841f20e4Binary files /dev/null and b/frontend/rust-lib/flowy-server/docs/architecture.png differdiff --git a/frontend/rust-lib/flowy-server/docs/schema-Triggers_in_Database.png b/frontend/rust-lib/flowy-server/docs/schema-Triggers_in_Database.pngnew file mode 100644index 0000000000..37f8a3bfa8Binary files /dev/null and b/frontend/rust-lib/flowy-server/docs/schema-Triggers_in_Database.png differdiff --git a/frontend/rust-lib/flowy-server/docs/schema.plantuml b/frontend/rust-lib/flowy-server/docs/schema.plantumlnew file mode 100644index 0000000000..69e65310a5--- /dev/null+++ b/frontend/rust-lib/flowy-server/docs/schema.plantuml@@ -0,0 +1,203 @@+@startuml+left to right direction++entity "af_roles" as roles {+ id : SERIAL (PK)+ name : TEXT+}++entity "af_permissions" as permissions {+ id : SERIAL (PK)+ name : VARCHAR(255)+ access_level : INTEGER+ description : TEXT+}++entity "af_role_permissions" as role_permissions {+ role_id : INT (FK af_roles.id)+ permission_id : INT (FK af_permissions.id)+ --+ (role_id, permission_id) : PK+}++entity "af_user" as user {+ uuid : UUID (PK)+ email : TEXT+ uid : BIGSERIAL+ name : TEXT+ created_at : TIMESTAMP WITH TIME ZONE+}++entity "af_workspace" as workspace {+ workspace_id : UUID (PK)+ database_storage_id : UUID+ owner_uid : BIGINT (FK af_user.uid)+ created_at : TIMESTAMP WITH TIME ZONE+ workspace_type : INTEGER+ workspace_name : TEXT+}++entity "af_workspace_member" as workspace_member {+ uid : BIGINT+ role_id : INT (FK af_roles.id)+ workspace_id : UUID (FK af_workspace.workspace_id)+ created_at : TIMESTAMP WITH TIME ZONE+ updated_at : TIMESTAMP WITH TIME ZONE+ --+ (uid, workspace_id) : PK+}++entity "af_collab" as collab {+ oid : TEXT (PK)+ owner_uid : BIGINT+ workspace_id : UUID (FK af_workspace.workspace_id)+ access_level : INTEGER+ created_at : TIMESTAMP WITH TIME ZONE+}++entity "af_collab_update" as collab_update {+ oid : TEXT (FK af_collab.oid)+ key : BIGSERIAL+ value : BYTEA+ value_size : INTEGER+ partition_key : INTEGER+ uid : BIGINT+ md5 : TEXT+ created_at : TIMESTAMP WITH TIME ZONE+ workspace_id : UUID (FK af_workspace.workspace_id)+ --+ (oid, key, partition_key) : PK+}+++entity "af_collab_update_document" as af_collab_update_document {+ Inherits af_collab_update (partition_key = 0)+}++entity "af_collab_update_database" as af_collab_update_database {+ Inherits af_collab_update (partition_key = 1)+}++entity "af_collab_update_w_database" as af_collab_update_w_database {+ Inherits af_collab_update (partition_key = 2)+}++entity "af_collab_update_folder" as af_collab_update_folder {+ Inherits af_collab_update (partition_key = 3)+}++af_collab_update_document -u-|> collab_update+af_collab_update_database -u-|> collab_update+af_collab_update_w_database -u-|> collab_update+af_collab_update_folder -u-|> collab_update++entity "af_database_row_update" as database_row_update {+ oid : TEXT+ key : BIGSERIAL+ value : BYTEA+ value_size : INTEGER+ partition_key : INTEGER+ uid : BIGINT+ md5 : TEXT+ workspace_id : UUID (FK af_workspace.workspace_id)+ --+ (oid, key) : PK+}++entity "af_collab_member" as collab_member {+ uid : BIGINT (FK af_user.uid)+ oid : TEXT (FK af_collab.oid)+ role_id : INTEGER (FK af_roles.id)+ --+ (uid, oid) : PK+}++entity "af_collab_statistics" as collab_statistics {+ oid : TEXT (PK)+ edit_count : BIGINT+}++entity "af_collab_snapshot" as collab_snapshot {+ sid : BIGSERIAL (PK)+ oid : TEXT (FK af_collab.oid)+ name : TEXT+ blob : BYTEA+ blob_size : INTEGER+ edit_count : BIGINT+ created_at : TIMESTAMP WITH TIME ZONE+}+++roles <-- role_permissions : FK+permissions <-u- role_permissions : FK+user <-- collab : FK+user <-- workspace : FK+user <-- collab_member : FK+roles <-- workspace_member : FK+workspace <-- workspace_member : FK+workspace <-- collab : FK+workspace <-- database_row_update : FK+collab <-- collab_update : FK+collab <-- collab_snapshot: FK+collab <-u- collab_member : FK+collab <-- collab_statistics : PK+roles <-- collab_member : FK+++@enduml++@startuml+title Triggers in Database Schema++participant "af_user" as A+participant "af_workspace" as B+participant "af_workspace_member" as C+participant "af_collab" as D+participant "af_collab_update" as E+participant "af_collab_member" as F+participant "af_collab_statistics" as G+participant "af_collab_snapshot" as H++A -> B: create_af_workspace_trigger+note right+This trigger fires after an insert on af_user. It automatically creates a workspace+with the uid of the new user as the owner_uid.+end note++B -> C: manage_af_workspace_member_role_trigger+note right+This trigger fires after an insert on af_workspace. It automatically+creates a workspace member in the af_workspace_member table with the+role 'Owner'.+end note++E -> D: insert_into_af_collab_trigger+note right+This trigger fires before an insert on af_collab_update.+It checks if a corresponding collab exists in the af_collab table.+If not, it creates one with the oid, uid, and current timestamp.+end note++D -> F: insert_into_af_collab_member_trigger+note right+This trigger fires after an insert on af_collab.+It automatically adds the collab's owner to the af_collab_member+table with the role 'Owner'.+end note++E -> G: af_collab_update_edit_count_trigger+note right+ This trigger fires after an insert on af_collab_update.+ It increments the edit_count of the corresponding collab in+ the af_collab_statistics table.+end note++H -> G: af_collab_snapshot_update_edit_count_trigger+note right+ This trigger fires after an insert on af_collab_snapshot.+ It sets the edit_count of the new snapshot to the current+ edit_count of the collab in the af_collab_statistics table.+end note++@enduml+diff --git a/frontend/rust-lib/flowy-server/docs/schema.png b/frontend/rust-lib/flowy-server/docs/schema.pngnew file mode 100644index 0000000000..1130fd83d6Binary files /dev/null and b/frontend/rust-lib/flowy-server/docs/schema.png differdiff --git a/frontend/rust-lib/flowy-server/src/lib.rs b/frontend/rust-lib/flowy-server/src/lib.rsindex 85d1fe81f2..ef1cecb955 100644--- a/frontend/rust-lib/flowy-server/src/lib.rs+++ b/frontend/rust-lib/flowy-server/src/lib.rs@@ -1,11 +1,11 @@use std::sync::Arc;-use appflowy_integrate::RemoteCollabStorage;+use collab_plugins::cloud_storage::RemoteCollabStorage;-use flowy_database2::deps::DatabaseCloudService;-use flowy_document2::deps::DocumentCloudService;-use flowy_folder2::deps::FolderCloudService;-use flowy_user::event_map::UserAuthService;+use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_document_deps::cloud::DocumentCloudService;+use flowy_folder_deps::cloud::FolderCloudService;+use flowy_user_deps::cloud::UserService;pub mod local_server;mod request;@@ -14,23 +14,9 @@ pub mod self_host;pub mod supabase;pub mod util;-/// In order to run this the supabase test, you need to create a .env file in the root directory of this project-/// and add the following environment variables:-/// - SUPABASE_URL-/// - SUPABASE_ANON_KEY-/// - SUPABASE_KEY-/// - SUPABASE_JWT_SECRET-///-/// the .env file should look like this:-/// SUPABASE_URL=https://<your-supabase-url>.supabase.co-/// SUPABASE_ANON_KEY=<your-supabase-anon-key>-/// SUPABASE_KEY=<your-supabase-key>-/// SUPABASE_JWT_SECRET=<your-supabase-jwt-secret>-///-pub trait AppFlowyServer: Send + Sync + 'static {fn enable_sync(&self, _enable: bool) {}- fn user_service(&self) -> Arc<dyn UserAuthService>;+ fn user_service(&self) -> Arc<dyn UserService>;fn folder_service(&self) -> Arc<dyn FolderCloudService>;fn database_service(&self) -> Arc<dyn DatabaseCloudService>;fn document_service(&self) -> Arc<dyn DocumentCloudService>;diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/database.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/database.rsindex cc3ca3b1ad..c753326e6d 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/database.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/database.rs@@ -1,27 +1,35 @@-use flowy_database2::deps::{+use anyhow::Error;+use collab_plugins::cloud_storage::CollabType;++use flowy_database_deps::cloud::{CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,};-use flowy_error::FlowyError;+use lib_infra::future::FutureResult;pub(crate) struct LocalServerDatabaseCloudServiceImpl();impl DatabaseCloudService for LocalServerDatabaseCloudServiceImpl {- fn get_collab_update(&self, _object_id: &str) -> FutureResult<CollabObjectUpdate, FlowyError> {+ fn get_collab_update(+ &self,+ _object_id: &str,+ _object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdate, Error> {FutureResult::new(async move { Ok(vec![]) })}fn batch_get_collab_updates(&self,_object_ids: Vec<String>,- ) -> FutureResult<CollabObjectUpdateByOid, FlowyError> {+ _object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdateByOid, Error> {FutureResult::new(async move { Ok(CollabObjectUpdateByOid::default()) })}fn get_collab_latest_snapshot(&self,_object_id: &str,- ) -> FutureResult<Option<DatabaseSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DatabaseSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}}diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/document.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/document.rsindex 220b7e0311..228886da03 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/document.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/document.rs@@ -1,25 +1,23 @@-use flowy_document2::deps::{DocumentCloudService, DocumentData, DocumentSnapshot};-use flowy_error::FlowyError;+use anyhow::Error;+use flowy_document_deps::cloud::*;+use lib_infra::future::FutureResult;pub(crate) struct LocalServerDocumentCloudServiceImpl();impl DocumentCloudService for LocalServerDocumentCloudServiceImpl {- fn get_document_updates(&self, _document_id: &str) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ fn get_document_updates(&self, _document_id: &str) -> FutureResult<Vec<Vec<u8>>, Error> {FutureResult::new(async move { Ok(vec![]) })}fn get_document_latest_snapshot(&self,_document_id: &str,- ) -> FutureResult<Option<DocumentSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DocumentSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}- fn get_document_data(- &self,- _document_id: &str,- ) -> FutureResult<Option<DocumentData>, FlowyError> {+ fn get_document_data(&self, _document_id: &str) -> FutureResult<Option<DocumentData>, Error> {FutureResult::new(async move { Ok(None) })}}diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rsindex 5862f9000d..96b2f57af2 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs@@ -1,8 +1,9 @@+use anyhow::Error;use std::sync::Arc;-use flowy_error::FlowyError;-use flowy_folder2::deps::{FolderCloudService, FolderData, FolderSnapshot, Workspace};-use flowy_folder2::gen_workspace_id;+use flowy_folder_deps::cloud::{+ gen_workspace_id, FolderCloudService, FolderData, FolderSnapshot, Workspace,+};use lib_infra::future::FutureResult;use lib_infra::util::timestamp;@@ -13,11 +14,11 @@ pub(crate) struct LocalServerFolderCloudServiceImpl {}impl FolderCloudService for LocalServerFolderCloudServiceImpl {- fn create_workspace(&self, _uid: i64, name: &str) -> FutureResult<Workspace, FlowyError> {+ fn create_workspace(&self, _uid: i64, name: &str) -> FutureResult<Workspace, Error> {let name = name.to_string();FutureResult::new(async move {Ok(Workspace {- id: gen_workspace_id(),+ id: gen_workspace_id().to_string(),name: name.to_string(),child_views: Default::default(),created_at: timestamp(),@@ -25,22 +26,18 @@ impl FolderCloudService for LocalServerFolderCloudServiceImpl {})}- fn get_folder_data(&self, _workspace_id: &str) -> FutureResult<Option<FolderData>, FlowyError> {+ fn get_folder_data(&self, _workspace_id: &str) -> FutureResult<Option<FolderData>, Error> {FutureResult::new(async move { Ok(None) })}fn get_folder_latest_snapshot(&self,_workspace_id: &str,- ) -> FutureResult<Option<FolderSnapshot>, FlowyError> {+ ) -> FutureResult<Option<FolderSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}- fn get_folder_updates(- &self,- workspace_id: &str,- uid: i64,- ) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ fn get_folder_updates(&self, workspace_id: &str, uid: i64) -> FutureResult<Vec<Vec<u8>>, Error> {let weak_db = Arc::downgrade(&self.db);let workspace_id = workspace_id.to_string();FutureResult::new(async move {diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rsindex 0b2888b535..501a612c08 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs@@ -1,13 +1,11 @@+use anyhow::Error;use std::sync::Arc;use lazy_static::lazy_static;use parking_lot::Mutex;-use flowy_error::FlowyError;-use flowy_user::entities::{- SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile,-};-use flowy_user::event_map::{UserAuthService, UserCredentials};+use flowy_user_deps::cloud::UserService;+use flowy_user_deps::entities::*;use lib_infra::box_any::BoxAny;use lib_infra::future::FutureResult;@@ -19,19 +17,22 @@ lazy_static! {}pub(crate) struct LocalServerUserAuthServiceImpl {+ #[allow(dead_code)]pub db: Arc<dyn LocalServerDB>,}-impl UserAuthService for LocalServerUserAuthServiceImpl {- fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, FlowyError> {+impl UserService for LocalServerUserAuthServiceImpl {+ fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, Error> {FutureResult::new(async move {let params = params.unbox_or_error::<SignUpParams>()?;let uid = ID_GEN.lock().next_id();let workspace_id = uuid::Uuid::new_v4().to_string();+ let user_workspace = UserWorkspace::new(&workspace_id, uid);Ok(SignUpResponse {user_id: uid,name: params.name,- workspace_id,+ latest_workspace: user_workspace.clone(),+ user_workspaces: vec![user_workspace],is_new: true,email: Some(params.email),token: None,@@ -39,8 +40,8 @@ impl UserAuthService for LocalServerUserAuthServiceImpl {})}- fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, FlowyError> {- let weak_db = Arc::downgrade(&self.db);+ fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, Error> {+ let db = self.db.clone();FutureResult::new(async move {let params: SignInParams = params.unbox_or_error::<SignInParams>()?;let uid = match params.uid {@@ -48,24 +49,21 @@ impl UserAuthService for LocalServerUserAuthServiceImpl {Some(uid) => uid,};- // Get the workspace id from the database if it exists, otherwise generate a new one.- let workspace_id = weak_db- .upgrade()- .and_then(|db| db.get_user_profile(uid).ok())- .and_then(|user_profile| user_profile.map(|user_profile| user_profile.workspace_id))- .unwrap_or(uuid::Uuid::new_v4().to_string());-+ let user_workspace = db+ .get_user_workspace(uid)?+ .unwrap_or_else(make_user_workspace);Ok(SignInResponse {user_id: uid,name: params.name,- workspace_id,+ latest_workspace: user_workspace.clone(),+ user_workspaces: vec![user_workspace],email: Some(params.email),token: None,})})}- fn sign_out(&self, _token: Option<String>) -> FutureResult<(), FlowyError> {+ fn sign_out(&self, _token: Option<String>) -> FutureResult<(), Error> {FutureResult::new(async { Ok(()) })}@@ -73,18 +71,47 @@ impl UserAuthService for LocalServerUserAuthServiceImpl {&self,_credential: UserCredentials,_params: UpdateUserProfileParams,- ) -> FutureResult<(), FlowyError> {+ ) -> FutureResult<(), Error> {FutureResult::new(async { Ok(()) })}fn get_user_profile(&self,_credential: UserCredentials,- ) -> FutureResult<Option<UserProfile>, FlowyError> {+ ) -> FutureResult<Option<UserProfile>, Error> {FutureResult::new(async { Ok(None) })}- fn check_user(&self, _credential: UserCredentials) -> FutureResult<(), FlowyError> {+ fn get_user_workspaces(&self, _uid: i64) -> FutureResult<Vec<UserWorkspace>, Error> {+ FutureResult::new(async { Ok(vec![]) })+ }++ fn check_user(&self, _credential: UserCredentials) -> FutureResult<(), Error> {+ FutureResult::new(async { Ok(()) })+ }++ fn add_workspace_member(+ &self,+ _user_email: String,+ _workspace_id: String,+ ) -> FutureResult<(), Error> {+ FutureResult::new(async { Ok(()) })+ }++ fn remove_workspace_member(+ &self,+ _user_email: String,+ _workspace_id: String,+ ) -> FutureResult<(), Error> {FutureResult::new(async { Ok(()) })}}++fn make_user_workspace() -> UserWorkspace {+ UserWorkspace {+ id: uuid::Uuid::new_v4().to_string(),+ name: "My Workspace".to_string(),+ created_at: Default::default(),+ database_storage_id: uuid::Uuid::new_v4().to_string(),+ }+}diff --git a/frontend/rust-lib/flowy-server/src/local_server/server.rs b/frontend/rust-lib/flowy-server/src/local_server/server.rsindex fe255900a0..637f8e3b1a 100644--- a/frontend/rust-lib/flowy-server/src/local_server/server.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/server.rs@@ -1,17 +1,18 @@use std::sync::Arc;-use appflowy_integrate::RemoteCollabStorage;-use collab_document::YrsDocAction;+use collab_plugins::cloud_storage::RemoteCollabStorage;use parking_lot::RwLock;use tokio::sync::mpsc;-use flowy_database2::deps::DatabaseCloudService;-use flowy_document2::deps::DocumentCloudService;+use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_document_deps::cloud::DocumentCloudService;use flowy_error::FlowyError;-use flowy_folder2::deps::FolderCloudService;-use flowy_user::entities::UserProfile;-use flowy_user::event_map::UserAuthService;-use flowy_user::services::database::{get_user_profile, open_collab_db, open_user_db};+use flowy_folder_deps::cloud::FolderCloudService;+// use flowy_user::services::database::{+// get_user_profile, get_user_workspace, open_collab_db, open_user_db,+// };+use flowy_user_deps::cloud::UserService;+use flowy_user_deps::entities::*;use crate::local_server::impls::{LocalServerDatabaseCloudServiceImpl, LocalServerDocumentCloudServiceImpl,@@ -21,18 +22,19 @@ use crate::AppFlowyServer;pub trait LocalServerDB: Send + Sync + 'static {fn get_user_profile(&self, uid: i64) -> Result<Option<UserProfile>, FlowyError>;+ fn get_user_workspace(&self, uid: i64) -> Result<Option<UserWorkspace>, FlowyError>;fn get_collab_updates(&self, uid: i64, object_id: &str) -> Result<Vec<Vec<u8>>, FlowyError>;}pub struct LocalServer {- storage_path: String,+ local_db: Arc<dyn LocalServerDB>,stop_tx: RwLock<Option<mpsc::Sender<()>>>,}impl LocalServer {- pub fn new(storage_path: &str) -> Self {+ pub fn new(local_db: Arc<dyn LocalServerDB>) -> Self {Self {- storage_path: storage_path.to_string(),+ local_db,stop_tx: Default::default(),}}@@ -46,18 +48,16 @@ impl LocalServer {}impl AppFlowyServer for LocalServer {- fn user_service(&self) -> Arc<dyn UserAuthService> {- let db = LocalServerDBImpl {- storage_path: self.storage_path.clone(),- };- Arc::new(LocalServerUserAuthServiceImpl { db: Arc::new(db) })+ fn user_service(&self) -> Arc<dyn UserService> {+ Arc::new(LocalServerUserAuthServiceImpl {+ db: self.local_db.clone(),+ })}fn folder_service(&self) -> Arc<dyn FolderCloudService> {- let db = LocalServerDBImpl {- storage_path: self.storage_path.clone(),- };- Arc::new(LocalServerFolderCloudServiceImpl { db: Arc::new(db) })+ Arc::new(LocalServerFolderCloudServiceImpl {+ db: self.local_db.clone(),+ })}fn database_service(&self) -> Arc<dyn DatabaseCloudService> {@@ -72,25 +72,3 @@ impl AppFlowyServer for LocalServer {None}}--struct LocalServerDBImpl {- storage_path: String,-}--impl LocalServerDB for LocalServerDBImpl {- fn get_user_profile(&self, uid: i64) -> Result<Option<UserProfile>, FlowyError> {- let sqlite_db = open_user_db(&self.storage_path, uid)?;- let user_profile = get_user_profile(&sqlite_db, uid).ok();- Ok(user_profile)- }-- fn get_collab_updates(&self, uid: i64, object_id: &str) -> Result<Vec<Vec<u8>>, FlowyError> {- let collab_db = open_collab_db(&self.storage_path, uid)?;- let read_txn = collab_db.read_txn();- let updates = read_txn- .get_all_updates(uid, object_id)- .map_err(|e| FlowyError::internal().context(format!("Failed to open collab db: {:?}", e)))?;-- Ok(updates)- }-}diff --git a/frontend/rust-lib/flowy-server/src/request.rs b/frontend/rust-lib/flowy-server/src/request.rsindex 30a05d187f..49f0994345 100644--- a/frontend/rust-lib/flowy-server/src/request.rs+++ b/frontend/rust-lib/flowy-server/src/request.rs@@ -83,7 +83,7 @@ impl HttpRequestBuilder {whereT: serde::Serialize,{- let bytes = Bytes::from(serde_json::to_vec(&body).map_err(internal_error)?);+ let bytes = Bytes::from(serde_json::to_vec(&body)?);self.bytes(bytes)}@@ -104,7 +104,10 @@ impl HttpRequestBuilder {let builder = self.inner_send().await?;match builder.response {None => Err(unexpected_empty_payload(&builder.url)),- Some(data) => serde_json::from_slice(&data).map_err(internal_error),+ Some(data) => {+ let value = serde_json::from_slice(&data)?;+ Ok(value)+ },}}@@ -137,9 +140,9 @@ impl HttpRequestBuilder {let _ = tx.send(response);});- let response = rx.await.map_err(internal_error)?.map_err(internal_error)?;+ let response = rx.await.map_err(internal_error)?;tracing::trace!("Http Response: {:?}", response);- let flowy_response = flowy_response_from(response).await?;+ let flowy_response = flowy_response_from(response?).await?;let token = self.token();self.middleware.iter().for_each(|middleware| {middleware.receive_response(&token, &flowy_response);@@ -160,16 +163,16 @@ fn unexpected_empty_payload(url: &str) -> FlowyError {}async fn flowy_response_from(original: Response) -> Result<HttpResponse, FlowyError> {- let bytes = original.bytes().await.map_err(internal_error)?;- let response: HttpResponse = serde_json::from_slice(&bytes).map_err(internal_error)?;+ let bytes = original.bytes().await?;+ let response: HttpResponse = serde_json::from_slice(&bytes)?;Ok(response)}#[allow(dead_code)]async fn get_response_data(original: Response) -> Result<Bytes, FlowyError> {if original.status() == http::StatusCode::OK {- let bytes = original.bytes().await.map_err(internal_error)?;- let response: HttpResponse = serde_json::from_slice(&bytes).map_err(internal_error)?;+ let bytes = original.bytes().await?;+ let response: HttpResponse = serde_json::from_slice(&bytes)?;match response.error {None => Ok(response.data),Some(error) => Err(FlowyError::new(error.code, &error.msg)),diff --git a/frontend/rust-lib/flowy-server/src/self_host/impls/database.rs b/frontend/rust-lib/flowy-server/src/self_host/impls/database.rsindex 0ce0395394..683adf3d6d 100644--- a/frontend/rust-lib/flowy-server/src/self_host/impls/database.rs+++ b/frontend/rust-lib/flowy-server/src/self_host/impls/database.rs@@ -1,27 +1,35 @@-use flowy_database2::deps::{+use anyhow::Error;+use collab_plugins::cloud_storage::CollabType;++use flowy_database_deps::cloud::{CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,};-use flowy_error::FlowyError;+use lib_infra::future::FutureResult;pub(crate) struct SelfHostedDatabaseCloudServiceImpl();impl DatabaseCloudService for SelfHostedDatabaseCloudServiceImpl {- fn get_collab_update(&self, _object_id: &str) -> FutureResult<CollabObjectUpdate, FlowyError> {+ fn get_collab_update(+ &self,+ _object_id: &str,+ _object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdate, Error> {FutureResult::new(async move { Ok(vec![]) })}fn batch_get_collab_updates(&self,_object_ids: Vec<String>,- ) -> FutureResult<CollabObjectUpdateByOid, FlowyError> {+ _object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdateByOid, Error> {FutureResult::new(async move { Ok(CollabObjectUpdateByOid::default()) })}fn get_collab_latest_snapshot(&self,_object_id: &str,- ) -> FutureResult<Option<DatabaseSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DatabaseSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}}diff --git a/frontend/rust-lib/flowy-server/src/self_host/impls/document.rs b/frontend/rust-lib/flowy-server/src/self_host/impls/document.rsindex 97e5e713d6..2a52ba8cc5 100644--- a/frontend/rust-lib/flowy-server/src/self_host/impls/document.rs+++ b/frontend/rust-lib/flowy-server/src/self_host/impls/document.rs@@ -1,25 +1,23 @@-use flowy_document2::deps::{DocumentCloudService, DocumentData, DocumentSnapshot};-use flowy_error::FlowyError;+use anyhow::Error;+use flowy_document_deps::cloud::*;+use lib_infra::future::FutureResult;pub(crate) struct SelfHostedDocumentCloudServiceImpl();impl DocumentCloudService for SelfHostedDocumentCloudServiceImpl {- fn get_document_updates(&self, _document_id: &str) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ fn get_document_updates(&self, _document_id: &str) -> FutureResult<Vec<Vec<u8>>, Error> {FutureResult::new(async move { Ok(vec![]) })}fn get_document_latest_snapshot(&self,_document_id: &str,- ) -> FutureResult<Option<DocumentSnapshot>, FlowyError> {+ ) -> FutureResult<Option<DocumentSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}- fn get_document_data(- &self,- _document_id: &str,- ) -> FutureResult<Option<DocumentData>, FlowyError> {+ fn get_document_data(&self, _document_id: &str) -> FutureResult<Option<DocumentData>, Error> {FutureResult::new(async move { Ok(None) })}}diff --git a/frontend/rust-lib/flowy-server/src/self_host/impls/folder.rs b/frontend/rust-lib/flowy-server/src/self_host/impls/folder.rsindex 9ee761a8fb..fcd102cf63 100644--- a/frontend/rust-lib/flowy-server/src/self_host/impls/folder.rs+++ b/frontend/rust-lib/flowy-server/src/self_host/impls/folder.rs@@ -1,17 +1,18 @@-use flowy_error::FlowyError;-use flowy_folder2::deps::{FolderCloudService, FolderData, FolderSnapshot, Workspace};-use flowy_folder2::gen_workspace_id;+use anyhow::Error;+use flowy_folder_deps::cloud::{+ gen_workspace_id, FolderCloudService, FolderData, FolderSnapshot, Workspace,+};use lib_infra::future::FutureResult;use lib_infra::util::timestamp;pub(crate) struct SelfHostedServerFolderCloudServiceImpl();impl FolderCloudService for SelfHostedServerFolderCloudServiceImpl {- fn create_workspace(&self, _uid: i64, name: &str) -> FutureResult<Workspace, FlowyError> {+ fn create_workspace(&self, _uid: i64, name: &str) -> FutureResult<Workspace, Error> {let name = name.to_string();FutureResult::new(async move {Ok(Workspace {- id: gen_workspace_id(),+ id: gen_workspace_id().to_string(),name: name.to_string(),child_views: Default::default(),created_at: timestamp(),@@ -19,14 +20,14 @@ impl FolderCloudService for SelfHostedServerFolderCloudServiceImpl {})}- fn get_folder_data(&self, _workspace_id: &str) -> FutureResult<Option<FolderData>, FlowyError> {+ fn get_folder_data(&self, _workspace_id: &str) -> FutureResult<Option<FolderData>, Error> {FutureResult::new(async move { Ok(None) })}fn get_folder_latest_snapshot(&self,_workspace_id: &str,- ) -> FutureResult<Option<FolderSnapshot>, FlowyError> {+ ) -> FutureResult<Option<FolderSnapshot>, Error> {FutureResult::new(async move { Ok(None) })}@@ -34,7 +35,7 @@ impl FolderCloudService for SelfHostedServerFolderCloudServiceImpl {&self,_workspace_id: &str,_uid: i64,- ) -> FutureResult<Vec<Vec<u8>>, FlowyError> {+ ) -> FutureResult<Vec<Vec<u8>>, Error> {FutureResult::new(async move { Ok(vec![]) })}diff --git a/frontend/rust-lib/flowy-server/src/self_host/impls/user.rs b/frontend/rust-lib/flowy-server/src/self_host/impls/user.rsindex c359fae27e..e3407b11a3 100644--- a/frontend/rust-lib/flowy-server/src/self_host/impls/user.rs+++ b/frontend/rust-lib/flowy-server/src/self_host/impls/user.rs@@ -1,8 +1,7 @@+use anyhow::Error;use flowy_error::{ErrorCode, FlowyError};-use flowy_user::entities::{- SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile,-};-use flowy_user::event_map::{UserAuthService, UserCredentials};+use flowy_user_deps::cloud::UserService;+use flowy_user_deps::entities::*;use lib_infra::box_any::BoxAny;use lib_infra::future::FutureResult;@@ -19,8 +18,8 @@ impl SelfHostedUserAuthServiceImpl {}}-impl UserAuthService for SelfHostedUserAuthServiceImpl {- fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, FlowyError> {+impl UserService for SelfHostedUserAuthServiceImpl {+ fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, Error> {let url = self.config.sign_up_url();FutureResult::new(async move {let params = params.unbox_or_error::<SignUpParams>()?;@@ -29,7 +28,7 @@ impl UserAuthService for SelfHostedUserAuthServiceImpl {})}- fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, FlowyError> {+ fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, Error> {let url = self.config.sign_in_url();FutureResult::new(async move {let params = params.unbox_or_error::<SignInParams>()?;@@ -38,13 +37,10 @@ impl UserAuthService for SelfHostedUserAuthServiceImpl {})}- fn sign_out(&self, token: Option<String>) -> FutureResult<(), FlowyError> {+ fn sign_out(&self, token: Option<String>) -> FutureResult<(), Error> {match token {None => FutureResult::new(async {- Err(FlowyError::new(- ErrorCode::InvalidParams,- "Token should not be empty",- ))+ Err(FlowyError::new(ErrorCode::InvalidParams, "Token should not be empty").into())}),Some(token) => {let token = token;@@ -61,13 +57,10 @@ impl UserAuthService for SelfHostedUserAuthServiceImpl {&self,credential: UserCredentials,params: UpdateUserProfileParams,- ) -> FutureResult<(), FlowyError> {+ ) -> FutureResult<(), Error> {match credential.token {None => FutureResult::new(async {- Err(FlowyError::new(- ErrorCode::InvalidParams,- "Token should not be empty",- ))+ Err(FlowyError::new(ErrorCode::InvalidParams, "Token should not be empty").into())}),Some(token) => {let token = token;@@ -83,14 +76,13 @@ impl UserAuthService for SelfHostedUserAuthServiceImpl {fn get_user_profile(&self,credential: UserCredentials,- ) -> FutureResult<Option<UserProfile>, FlowyError> {+ ) -> FutureResult<Option<UserProfile>, Error> {let url = self.config.user_profile_url();FutureResult::new(async move {match credential.token {- None => Err(FlowyError::new(- ErrorCode::UnexpectedEmpty,- "Token should not be empty",- )),+ None => {+ Err(FlowyError::new(ErrorCode::UnexpectedEmpty, "Token should not be empty").into())+ },Some(token) => {let profile = get_user_profile_request(&token, &url).await?;Ok(Some(profile))@@ -99,8 +91,34 @@ impl UserAuthService for SelfHostedUserAuthServiceImpl {})}- fn check_user(&self, _credential: UserCredentials) -> FutureResult<(), FlowyError> {- // TODO(nathan): implement the OpenAPI for this+ fn get_user_workspaces(+ &self,+ _uid: i64,+ ) -> FutureResult<std::vec::Vec<flowy_user_deps::entities::UserWorkspace>, Error> {+ // TODO(nathan): implement the RESTful API for this+ todo!()+ }++ fn check_user(&self, _credential: UserCredentials) -> FutureResult<(), Error> {+ // TODO(nathan): implement the RESTful API for this+ FutureResult::new(async { Ok(()) })+ }++ fn add_workspace_member(+ &self,+ _user_email: String,+ _workspace_id: String,+ ) -> FutureResult<(), Error> {+ // TODO(nathan): implement the RESTful API for this+ FutureResult::new(async { Ok(()) })+ }++ fn remove_workspace_member(+ &self,+ _user_email: String,+ _workspace_id: String,+ ) -> FutureResult<(), Error> {+ // TODO(nathan): implement the RESTful API for thisFutureResult::new(async { Ok(()) })}}diff --git a/frontend/rust-lib/flowy-server/src/self_host/server.rs b/frontend/rust-lib/flowy-server/src/self_host/server.rsindex 3a381c7036..4fd3683241 100644--- a/frontend/rust-lib/flowy-server/src/self_host/server.rs+++ b/frontend/rust-lib/flowy-server/src/self_host/server.rs@@ -1,11 +1,11 @@use std::sync::Arc;-use appflowy_integrate::RemoteCollabStorage;+use collab_plugins::cloud_storage::RemoteCollabStorage;-use flowy_database2::deps::DatabaseCloudService;-use flowy_document2::deps::DocumentCloudService;-use flowy_folder2::deps::FolderCloudService;-use flowy_user::event_map::UserAuthService;+use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_document_deps::cloud::DocumentCloudService;+use flowy_folder_deps::cloud::FolderCloudService;+use flowy_user_deps::cloud::UserService;use crate::self_host::configuration::SelfHostedConfiguration;use crate::self_host::impls::{@@ -25,7 +25,7 @@ impl SelfHostServer {}impl AppFlowyServer for SelfHostServer {- fn user_service(&self) -> Arc<dyn UserAuthService> {+ fn user_service(&self) -> Arc<dyn UserService> {Arc::new(SelfHostedUserAuthServiceImpl::new(self.config.clone()))}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/collab_storage.rs b/frontend/rust-lib/flowy-server/src/supabase/api/collab_storage.rsnew file mode 100644index 0000000000..9e5b7d8107--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/collab_storage.rs@@ -0,0 +1,218 @@+use std::str::FromStr;+use std::sync::Arc;++use anyhow::Error;+use chrono::{DateTime, Utc};+use collab::preclude::merge_updates_v1;+use collab_plugins::cloud_storage::{+ CollabObject, MsgId, RemoteCollabSnapshot, RemoteCollabState, RemoteCollabStorage,+ RemoteUpdateReceiver,+};+use tokio::task::spawn_blocking;++use lib_infra::async_trait::async_trait;+use lib_infra::util::md5;++use crate::supabase::api::request::{+ create_snapshot, get_latest_snapshot_from_server, get_updates_from_server,+ FetchObjectUpdateAction, UpdateItem,+};+use crate::supabase::api::util::{ExtendedResponse, InsertParamsBuilder};+use crate::supabase::api::{PostgresWrapper, SupabaseServerService};+use crate::supabase::define::*;++pub struct RESTfulSupabaseCollabStorageImpl<T>(T);++impl<T> RESTfulSupabaseCollabStorageImpl<T> {+ pub fn new(server: T) -> Self {+ Self(server)+ }+}++#[async_trait]+impl<T> RemoteCollabStorage for RESTfulSupabaseCollabStorageImpl<T>+where+ T: SupabaseServerService,+{+ fn is_enable(&self) -> bool {+ true+ }++ async fn get_all_updates(&self, object: &CollabObject) -> Result<Vec<Vec<u8>>, Error> {+ let postgrest = self.0.try_get_weak_postgrest()?;+ let action = FetchObjectUpdateAction::new(object.id.clone(), object.ty.clone(), postgrest);+ let updates = action.run().await?;+ Ok(updates)+ }++ async fn get_latest_snapshot(&self, object_id: &str) -> Option<RemoteCollabSnapshot> {+ let postgrest = self.0.try_get_postgrest().ok()?;+ get_latest_snapshot_from_server(object_id, postgrest)+ .await+ .ok()?+ }++ async fn get_collab_state(&self, object_id: &str) -> Result<Option<RemoteCollabState>, Error> {+ let postgrest = self.0.try_get_postgrest()?;+ let json = postgrest+ .from("af_collab_state")+ .select("*")+ .eq("oid", object_id)+ .order("snapshot_created_at.desc".to_string())+ .limit(1)+ .execute()+ .await?+ .get_json()+ .await?;++ Ok(+ json+ .as_array()+ .and_then(|array| array.first())+ .and_then(|value| {+ let created_at = value.get("snapshot_created_at").and_then(|created_at| {+ created_at+ .as_str()+ .map(|id| DateTime::<Utc>::from_str(id).ok())+ .and_then(|date| date)+ })?;++ let current_edit_count = value.get("current_edit_count").and_then(|id| id.as_i64())?;+ let last_snapshot_edit_count = value+ .get("last_snapshot_edit_count")+ .and_then(|id| id.as_i64())?;++ Some(RemoteCollabState {+ current_edit_count,+ last_snapshot_edit_count,+ last_snapshot_created_at: created_at.timestamp(),+ })+ }),+ )+ }++ async fn create_snapshot(&self, object: &CollabObject, snapshot: Vec<u8>) -> Result<i64, Error> {+ let postgrest = self.0.try_get_postgrest()?;+ create_snapshot(&postgrest, object, snapshot).await+ }++ async fn send_update(+ &self,+ object: &CollabObject,+ _id: MsgId,+ update: Vec<u8>,+ ) -> Result<(), Error> {+ let postgrest = self.0.try_get_postgrest()?;+ let workspace_id = object+ .get_workspace_id()+ .ok_or(anyhow::anyhow!("Invalid workspace id"))?;+ send_update(workspace_id, object, update, &postgrest).await+ }++ async fn send_init_sync(+ &self,+ object: &CollabObject,+ _id: MsgId,+ init_update: Vec<u8>,+ ) -> Result<(), Error> {+ let postgrest = self.0.try_get_postgrest()?;+ let workspace_id = object+ .get_workspace_id()+ .ok_or(anyhow::anyhow!("Invalid workspace id"))?;++ let update_items = get_updates_from_server(&object.id, &object.ty, postgrest.clone()).await?;++ // If the update_items is empty, we can send the init_update directly+ if update_items.is_empty() {+ send_update(workspace_id, object, init_update, &postgrest).await?;+ } else {+ // 2.Merge the updates into one and then delete the merged updates+ let merge_result = spawn_blocking(move || merge_updates(update_items, init_update)).await??;+ tracing::trace!("Merged updates count: {}", merge_result.merged_keys.len());+ let override_key = merge_result.merged_keys.last().cloned().unwrap();++ let value_size = merge_result.new_update.len() as i32;+ let md5 = md5(&merge_result.new_update);+ let new_update = format!("\\x{}", hex::encode(merge_result.new_update));+ let params = InsertParamsBuilder::new()+ .insert("oid", object.id.clone())+ .insert("new_key", override_key)+ .insert("new_value", new_update)+ .insert("md5", md5)+ .insert("value_size", value_size)+ .insert("partition_key", partition_key(&object.ty))+ .insert("uid", object.uid)+ .insert("workspace_id", workspace_id)+ .insert("removed_keys", merge_result.merged_keys)+ .build();++ postgrest+ .rpc("flush_collab_updates", params)+ .execute()+ .await?+ .success()+ .await?;+ }+ Ok(())+ }++ async fn subscribe_remote_updates(&self, _object: &CollabObject) -> Option<RemoteUpdateReceiver> {+ todo!()+ }+}++async fn send_update(+ workspace_id: String,+ object: &CollabObject,+ update: Vec<u8>,+ postgrest: &Arc<PostgresWrapper>,+) -> Result<(), Error> {+ let value_size = update.len() as i32;+ let md5 = md5(&update);+ let update = format!("\\x{}", hex::encode(update));+ let builder = InsertParamsBuilder::new()+ .insert("oid", object.id.clone())+ .insert("partition_key", partition_key(&object.ty))+ .insert("value", update)+ .insert("uid", object.uid)+ .insert("md5", md5)+ .insert("workspace_id", workspace_id)+ .insert("value_size", value_size);++ let params = builder.build();+ postgrest+ .from(&table_name(&object.ty))+ .insert(params)+ .execute()+ .await?+ .success()+ .await?;+ Ok(())+}++fn merge_updates(update_items: Vec<UpdateItem>, new_update: Vec<u8>) -> Result<MergeResult, Error> {+ let mut updates = vec![];+ let mut merged_keys = vec![];+ for item in update_items {+ merged_keys.push(item.key);+ updates.push(item.value);+ }+ if !new_update.is_empty() {+ updates.push(new_update);+ }+ let updates = updates+ .iter()+ .map(|update| update.as_ref())+ .collect::<Vec<&[u8]>>();++ let new_update = merge_updates_v1(&updates)?;+ Ok(MergeResult {+ merged_keys,+ new_update,+ })+}++struct MergeResult {+ merged_keys: Vec<i64>,+ new_update: Vec<u8>,+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/database.rs b/frontend/rust-lib/flowy-server/src/supabase/api/database.rsnew file mode 100644index 0000000000..be22902b9c--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/database.rs@@ -0,0 +1,91 @@+use anyhow::Error;+use collab_plugins::cloud_storage::CollabType;+use tokio::sync::oneshot::channel;++use flowy_database_deps::cloud::{+ CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,+};+use lib_infra::future::FutureResult;++use crate::supabase::api::request::{+ get_latest_snapshot_from_server, BatchFetchObjectUpdateAction, FetchObjectUpdateAction,+};+use crate::supabase::api::SupabaseServerService;++pub struct RESTfulSupabaseDatabaseServiceImpl<T> {+ server: T,+}++impl<T> RESTfulSupabaseDatabaseServiceImpl<T> {+ pub fn new(server: T) -> Self {+ Self { server }+ }+}++impl<T> DatabaseCloudService for RESTfulSupabaseDatabaseServiceImpl<T>+where+ T: SupabaseServerService,+{+ fn get_collab_update(+ &self,+ object_id: &str,+ object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdate, Error> {+ let try_get_postgrest = self.server.try_get_weak_postgrest();+ let object_id = object_id.to_string();+ let (tx, rx) = channel();+ tokio::spawn(async move {+ tx.send(+ async move {+ let postgrest = try_get_postgrest?;+ FetchObjectUpdateAction::new(object_id.to_string(), object_ty, postgrest)+ .run_with_fix_interval(5, 10)+ .await+ }+ .await,+ )+ });+ FutureResult::new(async { rx.await? })+ }++ fn batch_get_collab_updates(+ &self,+ object_ids: Vec<String>,+ object_ty: CollabType,+ ) -> FutureResult<CollabObjectUpdateByOid, Error> {+ let try_get_postgrest = self.server.try_get_weak_postgrest();+ let (tx, rx) = channel();+ tokio::spawn(async move {+ tx.send(+ async move {+ let postgrest = try_get_postgrest?;+ BatchFetchObjectUpdateAction::new(object_ids, object_ty, postgrest)+ .run()+ .await+ }+ .await,+ )+ });+ FutureResult::new(async { rx.await? })+ }++ fn get_collab_latest_snapshot(+ &self,+ object_id: &str,+ ) -> FutureResult<Option<DatabaseSnapshot>, Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ let object_id = object_id.to_string();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let snapshot = get_latest_snapshot_from_server(&object_id, postgrest)+ .await?+ .map(|snapshot| DatabaseSnapshot {+ snapshot_id: snapshot.sid,+ database_id: snapshot.oid,+ data: snapshot.blob,+ created_at: snapshot.created_at,+ });+ Ok(snapshot)+ })+ }+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/document.rs b/frontend/rust-lib/flowy-server/src/supabase/api/document.rsnew file mode 100644index 0000000000..f82c0dbd55--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/document.rs@@ -0,0 +1,82 @@+use anyhow::Error;+use collab::core::origin::CollabOrigin;+use collab_document::blocks::DocumentData;+use collab_document::document::Document;+use collab_plugins::cloud_storage::CollabType;+use tokio::sync::oneshot::channel;++use flowy_document_deps::cloud::{DocumentCloudService, DocumentSnapshot};+use lib_infra::future::FutureResult;++use crate::supabase::api::request::{get_latest_snapshot_from_server, FetchObjectUpdateAction};+use crate::supabase::api::SupabaseServerService;++pub struct RESTfulSupabaseDocumentServiceImpl<T>(T);+impl<T> RESTfulSupabaseDocumentServiceImpl<T> {+ pub fn new(server: T) -> Self {+ Self(server)+ }+}++impl<T> DocumentCloudService for RESTfulSupabaseDocumentServiceImpl<T>+where+ T: SupabaseServerService,+{+ fn get_document_updates(&self, document_id: &str) -> FutureResult<Vec<Vec<u8>>, Error> {+ let try_get_postgrest = self.0.try_get_weak_postgrest();+ let document_id = document_id.to_string();+ let (tx, rx) = channel();+ tokio::spawn(async move {+ tx.send(+ async move {+ let postgrest = try_get_postgrest?;+ let action = FetchObjectUpdateAction::new(document_id, CollabType::Document, postgrest);+ action.run_with_fix_interval(5, 5).await+ }+ .await,+ )+ });+ FutureResult::new(async { rx.await? })+ }++ fn get_document_latest_snapshot(+ &self,+ document_id: &str,+ ) -> FutureResult<Option<DocumentSnapshot>, Error> {+ let try_get_postgrest = self.0.try_get_postgrest();+ let document_id = document_id.to_string();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let snapshot = get_latest_snapshot_from_server(&document_id, postgrest)+ .await?+ .map(|snapshot| DocumentSnapshot {+ snapshot_id: snapshot.sid,+ document_id: snapshot.oid,+ data: snapshot.blob,+ created_at: snapshot.created_at,+ });+ Ok(snapshot)+ })+ }++ fn get_document_data(&self, document_id: &str) -> FutureResult<Option<DocumentData>, Error> {+ let try_get_postgrest = self.0.try_get_weak_postgrest();+ let document_id = document_id.to_string();+ let (tx, rx) = channel();+ tokio::spawn(async move {+ tx.send(+ async move {+ let postgrest = try_get_postgrest?;+ let action =+ FetchObjectUpdateAction::new(document_id.clone(), CollabType::Document, postgrest);+ let updates = action.run_with_fix_interval(5, 10).await?;+ let document =+ Document::from_updates(CollabOrigin::Empty, updates, &document_id, vec![])?;+ Ok(document.get_document_data().ok())+ }+ .await,+ )+ });+ FutureResult::new(async { rx.await? })+ }+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs b/frontend/rust-lib/flowy-server/src/supabase/api/folder.rsnew file mode 100644index 0000000000..62e9b8d02a--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs@@ -0,0 +1,149 @@+use std::str::FromStr;++use anyhow::Error;+use chrono::{DateTime, Utc};+use collab::core::origin::CollabOrigin;+use collab_plugins::cloud_storage::CollabType;+use serde_json::Value;+use tokio::sync::oneshot::channel;++use flowy_folder_deps::cloud::{+ gen_workspace_id, Folder, FolderCloudService, FolderData, FolderSnapshot, Workspace,+};+use lib_infra::future::FutureResult;++use crate::supabase::api::request::{+ get_latest_snapshot_from_server, get_updates_from_server, FetchObjectUpdateAction,+};+use crate::supabase::api::util::{ExtendedResponse, InsertParamsBuilder};+use crate::supabase::api::SupabaseServerService;+use crate::supabase::define::*;++pub struct RESTfulSupabaseFolderServiceImpl<T>(T);++impl<T> RESTfulSupabaseFolderServiceImpl<T> {+ pub fn new(server: T) -> Self {+ Self(server)+ }+}++impl<T> FolderCloudService for RESTfulSupabaseFolderServiceImpl<T>+where+ T: SupabaseServerService,+{+ fn create_workspace(&self, uid: i64, name: &str) -> FutureResult<Workspace, Error> {+ let try_get_postgrest = self.0.try_get_postgrest();+ let name = name.to_string();+ let new_workspace_id = gen_workspace_id().to_string();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let insert_params = InsertParamsBuilder::new()+ .insert(OWNER_USER_UID, uid)+ .insert(WORKSPACE_ID, new_workspace_id.clone())+ .insert(WORKSPACE_NAME, name.to_string())+ .build();+ postgrest+ .from(WORKSPACE_TABLE)+ .insert(insert_params)+ .execute()+ .await?+ .success()+ .await?;++ // read the workspace+ let json = postgrest+ .from(WORKSPACE_TABLE)+ .select("*")+ .eq(WORKSPACE_ID, new_workspace_id)+ .execute()+ .await?+ .get_json()+ .await?;++ let workspace = workspace_from_json_value(json)?;+ Ok(workspace)+ })+ }++ fn get_folder_data(&self, workspace_id: &str) -> FutureResult<Option<FolderData>, Error> {+ let try_get_postgrest = self.0.try_get_postgrest();+ let workspace_id = workspace_id.to_string();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ get_updates_from_server(&workspace_id, &CollabType::Folder, postgrest)+ .await+ .map(|updates| {+ let updates = updates.into_iter().map(|item| item.value).collect();+ let folder =+ Folder::from_collab_raw_data(CollabOrigin::Empty, updates, &workspace_id, vec![])+ .ok()?;+ folder.get_folder_data()+ })+ })+ }++ fn get_folder_latest_snapshot(+ &self,+ workspace_id: &str,+ ) -> FutureResult<Option<FolderSnapshot>, Error> {+ let try_get_postgrest = self.0.try_get_postgrest();+ let workspace_id = workspace_id.to_string();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let snapshot = get_latest_snapshot_from_server(&workspace_id, postgrest)+ .await?+ .map(|snapshot| FolderSnapshot {+ snapshot_id: snapshot.sid,+ database_id: snapshot.oid,+ data: snapshot.blob,+ created_at: snapshot.created_at,+ });+ Ok(snapshot)+ })+ }++ fn get_folder_updates(&self, workspace_id: &str, _uid: i64) -> FutureResult<Vec<Vec<u8>>, Error> {+ let try_get_postgrest = self.0.try_get_weak_postgrest();+ let workspace_id = workspace_id.to_string();+ let (tx, rx) = channel();+ tokio::spawn(async move {+ tx.send(+ async move {+ let postgrest = try_get_postgrest?;+ let action = FetchObjectUpdateAction::new(workspace_id, CollabType::Folder, postgrest);+ action.run_with_fix_interval(5, 10).await+ }+ .await,+ )+ });+ FutureResult::new(async { rx.await? })+ }++ fn service_name(&self) -> String {+ "Supabase".to_string()+ }+}++fn workspace_from_json_value(value: Value) -> Result<Workspace, Error> {+ let json = value+ .as_array()+ .and_then(|values| values.first())+ .ok_or(anyhow::anyhow!("workspace not found"))?;+ Ok(Workspace {+ id: json+ .get(WORKSPACE_ID)+ .ok_or(anyhow::anyhow!("workspace id not found"))?+ .to_string(),+ name: json+ .get(WORKSPACE_NAME)+ .map(|value| value.to_string())+ .unwrap_or_default(),+ child_views: Default::default(),+ created_at: json+ .get(CREATED_AT)+ .and_then(|value| value.as_str())+ .and_then(|s| DateTime::<Utc>::from_str(s).ok())+ .map(|date| date.timestamp())+ .unwrap_or_default(),+ })+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/impls/mod.rs b/frontend/rust-lib/flowy-server/src/supabase/api/mod.rssimilarity index 70%rename from frontend/rust-lib/flowy-server/src/supabase/impls/mod.rsrename to frontend/rust-lib/flowy-server/src/supabase/api/mod.rsindex 65257a5951..85a1848021 100644--- a/frontend/rust-lib/flowy-server/src/supabase/impls/mod.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/api/mod.rs@@ -2,10 +2,14 @@ pub use collab_storage::*;pub use database::*;pub use document::*;pub use folder::*;+pub use postgres_server::*;pub use user::*;mod collab_storage;mod database;mod document;mod folder;+mod postgres_server;+mod request;mod user;+mod util;diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs b/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rsnew file mode 100644index 0000000000..7aaa752dbc--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/postgres_server.rs@@ -0,0 +1,82 @@+use anyhow::Error;+use parking_lot::RwLock;+use std::ops::Deref;+use std::sync::{Arc, Weak};++use flowy_error::{ErrorCode, FlowyError};+use postgrest::Postgrest;++use flowy_server_config::supabase_config::SupabaseConfiguration;++/// Creates a wrapper for Postgrest, which allows us to extend the functionality of Postgrest.+pub struct PostgresWrapper(Postgrest);++impl Deref for PostgresWrapper {+ type Target = Postgrest;++ fn deref(&self) -> &Self::Target {+ &self.0+ }+}++pub struct RESTfulPostgresServer {+ pub postgrest: Arc<PostgresWrapper>,+}++impl RESTfulPostgresServer {+ pub fn new(config: SupabaseConfiguration) -> Self {+ let url = format!("{}/rest/v1", config.url);+ let auth = format!("Bearer {}", config.anon_key);+ let postgrest = Postgrest::new(url)+ .insert_header("apikey", config.anon_key)+ .insert_header("Authorization", auth);+ Self {+ postgrest: Arc::new(PostgresWrapper(postgrest)),+ }+ }+}++pub trait SupabaseServerService: Send + Sync + 'static {+ fn get_postgrest(&self) -> Option<Arc<PostgresWrapper>>;+ fn try_get_postgrest(&self) -> Result<Arc<PostgresWrapper>, Error>;+ fn try_get_weak_postgrest(&self) -> Result<Weak<PostgresWrapper>, Error>;+}++#[derive(Clone)]+pub struct SupabaseServerServiceImpl(pub Arc<RwLock<Option<Arc<RESTfulPostgresServer>>>>);++impl SupabaseServerServiceImpl {+ pub fn new(postgrest: Arc<RESTfulPostgresServer>) -> Self {+ Self(Arc::new(RwLock::new(Some(postgrest))))+ }+}++impl SupabaseServerService for SupabaseServerServiceImpl {+ fn get_postgrest(&self) -> Option<Arc<PostgresWrapper>> {+ self+ .0+ .read()+ .as_ref()+ .map(|server| server.postgrest.clone())+ }++ fn try_get_postgrest(&self) -> Result<Arc<PostgresWrapper>, Error> {+ self+ .0+ .read()+ .as_ref()+ .map(|server| server.postgrest.clone())+ .ok_or_else(|| {+ FlowyError::new(+ ErrorCode::SupabaseSyncRequired,+ "Supabase sync is disabled, please enable it first",+ )+ .into()+ })+ }++ fn try_get_weak_postgrest(&self) -> Result<Weak<PostgresWrapper>, Error> {+ let postgrest = self.try_get_postgrest()?;+ Ok(Arc::downgrade(&postgrest))+ }+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/request.rs b/frontend/rust-lib/flowy-server/src/supabase/api/request.rsnew file mode 100644index 0000000000..296c672675--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/request.rs@@ -0,0 +1,304 @@+use std::future::Future;+use std::iter::Take;+use std::pin::Pin;+use std::str::FromStr;+use std::sync::{Arc, Weak};+use std::time::Duration;++use anyhow::Error;+use chrono::{DateTime, Utc};+use collab_plugins::cloud_storage::{CollabObject, CollabType, RemoteCollabSnapshot};+use serde_json::Value;+use tokio_retry::strategy::FixedInterval;+use tokio_retry::{Action, Retry};++use flowy_database_deps::cloud::{CollabObjectUpdate, CollabObjectUpdateByOid};+use lib_infra::util::md5;++use crate::supabase::api::util::{ExtendedResponse, InsertParamsBuilder};+use crate::supabase::api::PostgresWrapper;+use crate::supabase::define::*;++pub struct FetchObjectUpdateAction {+ object_id: String,+ object_ty: CollabType,+ postgrest: Weak<PostgresWrapper>,+}++impl FetchObjectUpdateAction {+ pub fn new(object_id: String, object_ty: CollabType, postgrest: Weak<PostgresWrapper>) -> Self {+ Self {+ postgrest,+ object_id,+ object_ty,+ }+ }++ pub fn run(self) -> Retry<Take<FixedInterval>, FetchObjectUpdateAction> {+ let retry_strategy = FixedInterval::new(Duration::from_secs(5)).take(3);+ Retry::spawn(retry_strategy, self)+ }++ pub fn run_with_fix_interval(+ self,+ secs: u64,+ times: usize,+ ) -> Retry<Take<FixedInterval>, FetchObjectUpdateAction> {+ let retry_strategy = FixedInterval::new(Duration::from_secs(secs)).take(times);+ Retry::spawn(retry_strategy, self)+ }+}++impl Action for FetchObjectUpdateAction {+ type Future = Pin<Box<dyn Future<Output = Result<Self::Item, Self::Error>> + Send>>;+ type Item = CollabObjectUpdate;+ type Error = anyhow::Error;++ fn run(&mut self) -> Self::Future {+ let weak_postgres = self.postgrest.clone();+ let object_id = self.object_id.clone();+ let object_ty = self.object_ty.clone();+ Box::pin(async move {+ match weak_postgres.upgrade() {+ None => Ok(vec![]),+ Some(postgrest) => {+ let items = get_updates_from_server(&object_id, &object_ty, postgrest).await?;+ Ok(items.into_iter().map(|item| item.value).collect())+ },+ }+ })+ }+}++pub struct BatchFetchObjectUpdateAction {+ object_ids: Vec<String>,+ object_ty: CollabType,+ postgrest: Weak<PostgresWrapper>,+}++impl BatchFetchObjectUpdateAction {+ pub fn new(+ object_ids: Vec<String>,+ object_ty: CollabType,+ postgrest: Weak<PostgresWrapper>,+ ) -> Self {+ Self {+ postgrest,+ object_ty,+ object_ids,+ }+ }++ pub fn run(self) -> Retry<Take<FixedInterval>, BatchFetchObjectUpdateAction> {+ let retry_strategy = FixedInterval::new(Duration::from_secs(5)).take(3);+ Retry::spawn(retry_strategy, self)+ }+}++impl Action for BatchFetchObjectUpdateAction {+ type Future = Pin<Box<dyn Future<Output = Result<Self::Item, Self::Error>> + Send>>;+ type Item = CollabObjectUpdateByOid;+ type Error = anyhow::Error;++ fn run(&mut self) -> Self::Future {+ let weak_postgrest = self.postgrest.clone();+ let object_ids = self.object_ids.clone();+ let object_ty = self.object_ty.clone();+ Box::pin(async move {+ match weak_postgrest.upgrade() {+ None => Ok(CollabObjectUpdateByOid::default()),+ Some(server) => batch_get_updates_from_server(object_ids, &object_ty, server).await,+ }+ })+ }+}++pub async fn create_snapshot(+ postgrest: &Arc<PostgresWrapper>,+ object: &CollabObject,+ snapshot: Vec<u8>,+) -> Result<i64, Error> {+ let value_size = snapshot.len() as i32;+ let snapshot = format!("\\x{}", hex::encode(snapshot));+ postgrest+ .from(AF_COLLAB_SNAPSHOT_TABLE)+ .insert(+ InsertParamsBuilder::new()+ .insert(AF_COLLAB_SNAPSHOT_OID_COLUMN, object.id.clone())+ .insert("name", object.ty.to_string())+ .insert(AF_COLLAB_SNAPSHOT_BLOB_COLUMN, snapshot)+ .insert(AF_COLLAB_SNAPSHOT_BLOB_SIZE_COLUMN, value_size)+ .build(),+ )+ .execute()+ .await?+ .success()+ .await?;++ Ok(1)+}++pub async fn get_latest_snapshot_from_server(+ object_id: &str,+ postgrest: Arc<PostgresWrapper>,+) -> Result<Option<RemoteCollabSnapshot>, Error> {+ let json = postgrest+ .from(AF_COLLAB_SNAPSHOT_TABLE)+ .select(format!(+ "{},{},{}",+ AF_COLLAB_SNAPSHOT_ID_COLUMN,+ AF_COLLAB_SNAPSHOT_BLOB_COLUMN,+ AF_COLLAB_SNAPSHOT_CREATED_AT_COLUMN+ ))+ .order(format!("{}.desc", AF_COLLAB_SNAPSHOT_ID_COLUMN))+ .limit(1)+ .eq(AF_COLLAB_SNAPSHOT_OID_COLUMN, object_id)+ .execute()+ .await?+ .get_json()+ .await?;++ let snapshot = json+ .as_array()+ .and_then(|array| array.first())+ .and_then(|value| {+ let blob = value+ .get("blob")+ .and_then(|blob| blob.as_str())+ .and_then(decode_hex_string)?;+ let sid = value.get("sid").and_then(|id| id.as_i64())?;+ let created_at = value.get("created_at").and_then(|created_at| {+ created_at+ .as_str()+ .map(|id| DateTime::<Utc>::from_str(id).ok())+ .and_then(|date| date)+ })?;++ Some(RemoteCollabSnapshot {+ sid,+ oid: object_id.to_string(),+ blob,+ created_at: created_at.timestamp(),+ })+ });+ Ok(snapshot)+}++pub async fn batch_get_updates_from_server(+ object_ids: Vec<String>,+ object_ty: &CollabType,+ postgrest: Arc<PostgresWrapper>,+) -> Result<CollabObjectUpdateByOid, Error> {+ let json = postgrest+ .from(table_name(object_ty))+ .select("oid, key, value, md5")+ .order(format!("{}.asc", AF_COLLAB_KEY_COLUMN))+ .in_("oid", object_ids)+ .execute()+ .await?+ .get_json()+ .await?;++ let mut updates_by_oid = CollabObjectUpdateByOid::new();+ if let Some(records) = json.as_array() {+ for record in records {+ if let Some(oid) = record.get("oid").and_then(|value| value.as_str()) {+ if let Ok(updates) = parser_updates_form_json(record.clone()) {+ let object_updates = updates_by_oid+ .entry(oid.to_string())+ .or_insert_with(Vec::new);+ tracing::debug!("get updates from server: {:?}", record);+ for update in updates {+ object_updates.push(update.value);+ }+ }+ }+ }+ }+ Ok(updates_by_oid)+}++pub async fn get_updates_from_server(+ object_id: &str,+ object_ty: &CollabType,+ postgrest: Arc<PostgresWrapper>,+) -> Result<Vec<UpdateItem>, Error> {+ let json = postgrest+ .from(table_name(object_ty))+ .select("key, value, md5")+ .order(format!("{}.asc", AF_COLLAB_KEY_COLUMN))+ .eq("oid", object_id)+ .execute()+ .await?+ .get_json()+ .await?;+ parser_updates_form_json(json)+}++/// json format:+/// ```json+/// [+/// {+/// "value": "\\x...",+/// "md5": "..."+/// },+/// {+/// "value": "\\x...",+/// "md5": "..."+/// },+/// ...+/// ]+/// ```+fn parser_updates_form_json(json: Value) -> Result<Vec<UpdateItem>, Error> {+ let mut updates = vec![];+ match json.as_array() {+ None => {+ updates.push(parser_update_from_json(&json)?);+ },+ Some(values) => {+ for value in values {+ updates.push(parser_update_from_json(value)?);+ }+ },+ }++ Ok(updates)+}++fn parser_update_from_json(json: &Value) -> Result<UpdateItem, Error> {+ let some_record = json+ .get("value")+ .and_then(|value| value.as_str())+ .and_then(decode_hex_string);++ let some_key = json.get("key").and_then(|value| value.as_i64());+ if let (Some(value), Some(key)) = (some_record, some_key) {+ // Check the md5 of the value that we received from the server is equal to the md5 of the value+ // that we calculated locally.+ if let Some(expected_md5) = json.get("md5").and_then(|v| v.as_str()) {+ let value_md5 = md5(&value);+ debug_assert!(+ value_md5 == expected_md5,+ "md5 not match: {} != {}",+ value_md5,+ expected_md5+ );+ }+ Ok(UpdateItem { key, value })+ } else {+ Err(anyhow::anyhow!(+ "missing key or value column in json: {:?}",+ json+ ))+ }+}++pub struct UpdateItem {+ pub key: i64,+ pub value: Vec<u8>,+}++fn decode_hex_string(s: &str) -> Option<Vec<u8>> {+ let s = s.strip_prefix("\\x")?;+ hex::decode(s).ok()+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/user.rs b/frontend/rust-lib/flowy-server/src/supabase/api/user.rsnew file mode 100644index 0000000000..b2fef41df7--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/user.rs@@ -0,0 +1,308 @@+use std::str::FromStr;+use std::sync::Arc;++use anyhow::Error;+use uuid::Uuid;++use flowy_user_deps::cloud::*;+use flowy_user_deps::entities::*;+use lib_infra::box_any::BoxAny;+use lib_infra::future::FutureResult;++use crate::supabase::api::util::{ExtendedResponse, InsertParamsBuilder};+use crate::supabase::api::{PostgresWrapper, SupabaseServerService};+use crate::supabase::define::*;+use crate::supabase::entities::GetUserProfileParams;+use crate::supabase::entities::UidResponse;+use crate::supabase::entities::UserProfileResponse;++pub struct RESTfulSupabaseUserAuthServiceImpl<T> {+ server: T,+}++impl<T> RESTfulSupabaseUserAuthServiceImpl<T> {+ pub fn new(server: T) -> Self {+ Self { server }+ }+}++impl<T> UserService for RESTfulSupabaseUserAuthServiceImpl<T>+where+ T: SupabaseServerService,+{+ fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let params = third_party_params_from_box_any(params)?;+ let is_new_user = postgrest+ .from(USER_TABLE)+ .select("uid")+ .eq("uuid", params.uuid.to_string())+ .execute()+ .await?+ .get_value::<Vec<UidResponse>>()+ .await?+ .is_empty();++ // Insert the user if it's a new user. After the user is inserted, we can query the user profile+ // and workspaces. The profile and workspaces are created by the database trigger.+ if is_new_user {+ let insert_params = InsertParamsBuilder::new()+ .insert(USER_UUID, params.uuid.to_string())+ .insert(USER_EMAIL, params.email)+ .build();+ let resp = postgrest+ .from(USER_TABLE)+ .insert(insert_params)+ .execute()+ .await?+ .success_with_body()+ .await?;+ tracing::debug!("Create user response: {:?}", resp);+ }++ // Query the user profile and workspaces+ tracing::debug!("user uuid: {}", params.uuid);+ let user_profile =+ get_user_profile(postgrest.clone(), GetUserProfileParams::Uuid(params.uuid))+ .await?+ .unwrap();+ let user_workspaces = get_user_workspaces(postgrest.clone(), user_profile.uid).await?;+ let latest_workspace = user_workspaces+ .iter()+ .find(|user_workspace| user_workspace.id == user_profile.latest_workspace_id)+ .cloned();++ Ok(SignUpResponse {+ user_id: user_profile.uid,+ name: user_profile.name,+ latest_workspace: latest_workspace.unwrap(),+ user_workspaces,+ is_new: is_new_user,+ email: Some(user_profile.email),+ token: None,+ })+ })+ }++ fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let params = third_party_params_from_box_any(params)?;+ let uuid = params.uuid;+ let user_profile = get_user_profile(postgrest.clone(), GetUserProfileParams::Uuid(uuid))+ .await?+ .unwrap();+ let user_workspaces = get_user_workspaces(postgrest.clone(), user_profile.uid).await?;+ let latest_workspace = user_workspaces+ .iter()+ .find(|user_workspace| user_workspace.id == user_profile.latest_workspace_id)+ .cloned();+ Ok(SignInResponse {+ user_id: user_profile.uid,+ name: "".to_string(),+ latest_workspace: latest_workspace.unwrap(),+ user_workspaces,+ email: None,+ token: None,+ })+ })+ }++ fn sign_out(&self, _token: Option<String>) -> FutureResult<(), Error> {+ FutureResult::new(async { Ok(()) })+ }++ fn update_user(+ &self,+ _credential: UserCredentials,+ params: UpdateUserProfileParams,+ ) -> FutureResult<(), Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ update_user_profile(postgrest, params).await?;+ Ok(())+ })+ }++ fn get_user_profile(+ &self,+ credential: UserCredentials,+ ) -> FutureResult<Option<UserProfile>, Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ let uid = credential+ .uid+ .ok_or(anyhow::anyhow!("uid is required"))+ .unwrap();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let user_profile_resp = get_user_profile(postgrest, GetUserProfileParams::Uid(uid)).await?;+ match user_profile_resp {+ None => Ok(None),+ Some(user_profile_resp) => Ok(Some(UserProfile {+ id: user_profile_resp.uid,+ email: user_profile_resp.email,+ name: user_profile_resp.name,+ token: "".to_string(),+ icon_url: "".to_string(),+ openai_key: "".to_string(),+ workspace_id: user_profile_resp.latest_workspace_id,+ auth_type: AuthType::Supabase,+ })),+ }+ })+ }++ fn get_user_workspaces(&self, uid: i64) -> FutureResult<Vec<UserWorkspace>, Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ let user_workspaces = get_user_workspaces(postgrest, uid).await?;+ Ok(user_workspaces)+ })+ }++ fn check_user(&self, credential: UserCredentials) -> FutureResult<(), Error> {+ let try_get_postgrest = self.server.try_get_postgrest();+ let uuid = credential.uuid.and_then(|uuid| Uuid::from_str(&uuid).ok());+ let uid = credential.uid;+ FutureResult::new(async move {+ let postgrest = try_get_postgrest?;+ check_user(postgrest, uid, uuid).await?;+ Ok(())+ })+ }++ fn add_workspace_member(+ &self,+ _user_email: String,+ _workspace_id: String,+ ) -> FutureResult<(), Error> {+ todo!()+ }++ fn remove_workspace_member(+ &self,+ _user_email: String,+ _workspace_id: String,+ ) -> FutureResult<(), Error> {+ todo!()+ }+}++async fn get_user_profile(+ postgrest: Arc<PostgresWrapper>,+ params: GetUserProfileParams,+) -> Result<Option<UserProfileResponse>, Error> {+ let mut builder = postgrest+ .from(USER_PROFILE_VIEW)+ .select("uid, email, name, latest_workspace_id");++ match params {+ GetUserProfileParams::Uid(uid) => builder = builder.eq("uid", uid.to_string()),+ GetUserProfileParams::Uuid(uuid) => builder = builder.eq("uuid", uuid.to_string()),+ }++ let mut profiles = builder+ .execute()+ .await?+ .error_for_status()?+ .get_value::<Vec<UserProfileResponse>>()+ .await?;+ match profiles.len() {+ 0 => Ok(None),+ 1 => Ok(Some(profiles.swap_remove(0))),+ _ => unreachable!(),+ }+}++async fn get_user_workspaces(+ postgrest: Arc<PostgresWrapper>,+ uid: i64,+) -> Result<Vec<UserWorkspace>, Error> {+ postgrest+ .from(WORKSPACE_TABLE)+ .select("id:workspace_id, name:workspace_name, created_at, database_storage_id")+ .eq("owner_uid", uid.to_string())+ .execute()+ .await?+ .error_for_status()?+ .get_value::<Vec<UserWorkspace>>()+ .await+}++async fn update_user_profile(+ postgrest: Arc<PostgresWrapper>,+ params: UpdateUserProfileParams,+) -> Result<(), Error> {+ if params.is_empty() {+ anyhow::bail!("no params to update");+ }++ // check if user exists+ let exists = !postgrest+ .from(USER_TABLE)+ .select("uid")+ .eq("uid", params.id.to_string())+ .execute()+ .await?+ .error_for_status()?+ .get_value::<Vec<UidResponse>>()+ .await?+ .is_empty();+ if !exists {+ anyhow::bail!("user uid {} does not exist", params.id);+ }++ let mut update_params = serde_json::Map::new();+ if let Some(name) = params.name {+ update_params.insert("name".to_string(), serde_json::json!(name));+ }+ if let Some(email) = params.email {+ update_params.insert("email".to_string(), serde_json::json!(email));+ }+ let update_payload = serde_json::to_string(&update_params).unwrap();++ let resp = postgrest+ .from(USER_TABLE)+ .update(update_payload)+ .eq("uid", params.id.to_string())+ .execute()+ .await?+ .success_with_body()+ .await?;++ tracing::debug!("update user profile resp: {:?}", resp);+ Ok(())+}++async fn check_user(+ postgrest: Arc<PostgresWrapper>,+ uid: Option<i64>,+ uuid: Option<Uuid>,+) -> Result<(), Error> {+ let mut builder = postgrest.from(USER_TABLE);++ if let Some(uid) = uid {+ builder = builder.eq("uid", uid.to_string());+ } else if let Some(uuid) = uuid {+ builder = builder.eq("uuid", uuid.to_string());+ } else {+ anyhow::bail!("uid or uuid is required");+ }++ let exists = !builder+ .execute()+ .await?+ .error_for_status()?+ .get_value::<Vec<UidResponse>>()+ .await?+ .is_empty();+ if !exists {+ anyhow::bail!("user does not exist, uid: {:?}, uuid: {:?}", uid, uuid);+ }+ Ok(())+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/util.rs b/frontend/rust-lib/flowy-server/src/supabase/api/util.rsnew file mode 100644index 0000000000..4c974c36d5--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/api/util.rs@@ -0,0 +1,128 @@+use anyhow::Error;+use reqwest::{Response, StatusCode};+use serde_json::Value;++use flowy_error::{ErrorCode, FlowyError};+use lib_infra::future::{to_fut, Fut};++pub struct InsertParamsBuilder {+ map: serde_json::Map<String, Value>,+}++impl InsertParamsBuilder {+ pub fn new() -> Self {+ Self {+ map: serde_json::Map::new(),+ }+ }++ pub fn insert<T: serde::Serialize>(mut self, key: &str, value: T) -> Self {+ self+ .map+ .insert(key.to_string(), serde_json::to_value(value).unwrap());+ self+ }++ pub fn build(self) -> String {+ serde_json::to_string(&self.map).unwrap()+ }+}+/// Trait `ExtendedResponse` provides an extension method to handle and transform the response data.+///+/// This trait introduces a single method:+///+/// - `get_value`: It extracts the value from the response, and returns it as an instance of a type `T`.+/// This method will return an error if the status code of the response signifies a failure (not success).+/// Otherwise, it attempts to parse the response body into an instance of type `T`, which must implement+/// `serde::de::DeserializeOwned`, `Send`, `Sync`, and have a static lifetime ('static).+pub trait ExtendedResponse {+ /// Returns the value of the response as a Future of `Result<T, Error>`.+ ///+ /// If the status code of the response is not a success, returns an `Error`.+ /// Otherwise, attempts to parse the response into an instance of type `T`.+ ///+ /// # Type Parameters+ ///+ /// * `T`: The type of the value to be returned. Must implement `serde::de::DeserializeOwned`,+ /// `Send`, `Sync`, and have a static lifetime ('static).+ fn get_value<T>(self) -> Fut<Result<T, Error>>+ where+ T: serde::de::DeserializeOwned + Send + Sync + 'static;++ fn get_json(self) -> Fut<Result<Value, Error>>;++ fn success(self) -> Fut<Result<(), Error>>;++ fn success_with_body(self) -> Fut<Result<String, Error>>;+}++impl ExtendedResponse for Response {+ fn get_value<T>(self) -> Fut<Result<T, Error>>+ where+ T: serde::de::DeserializeOwned + Send + Sync + 'static,+ {+ to_fut(async move {+ let status_code = self.status();+ if !status_code.is_success() {+ return Err(parse_response_as_error(self).await.into());+ }+ let bytes = self.bytes().await?;+ let value = serde_json::from_slice(&bytes).map_err(|e| {+ FlowyError::new(+ ErrorCode::Serde,+ format!(+ "failed to parse json: {}, body: {}",+ e,+ String::from_utf8_lossy(&bytes)+ ),+ )+ })?;+ Ok(value)+ })+ }++ fn get_json(self) -> Fut<Result<Value, Error>> {+ to_fut(async move {+ if !self.status().is_success() {+ return Err(parse_response_as_error(self).await.into());+ }+ let bytes = self.bytes().await?;+ let value = serde_json::from_slice::<Value>(&bytes)?;+ Ok(value)+ })+ }++ fn success(self) -> Fut<Result<(), Error>> {+ to_fut(async move {+ if !self.status().is_success() {+ return Err(parse_response_as_error(self).await.into());+ }+ Ok(())+ })+ }++ fn success_with_body(self) -> Fut<Result<String, Error>> {+ to_fut(async move {+ if !self.status().is_success() {+ return Err(parse_response_as_error(self).await.into());+ }+ Ok(self.text().await?)+ })+ }+}++async fn parse_response_as_error(response: Response) -> FlowyError {+ let status_code = response.status();+ let msg = response.text().await.unwrap_or_default();+ if status_code == StatusCode::CONFLICT {+ return FlowyError::new(ErrorCode::Conflict, msg);+ }++ FlowyError::new(+ ErrorCode::HttpError,+ format!(+ "expected status code 2XX, but got {}, body: {}",+ status_code, msg+ ),+ )+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/define.rs b/frontend/rust-lib/flowy-server/src/supabase/define.rsnew file mode 100644index 0000000000..e17989a77e--- /dev/null+++ b/frontend/rust-lib/flowy-server/src/supabase/define.rs@@ -0,0 +1,36 @@+use collab_plugins::cloud_storage::CollabType;++pub const AF_COLLAB_UPDATE_TABLE: &str = "af_collab_update";+pub const AF_COLLAB_KEY_COLUMN: &str = "key";+pub const AF_COLLAB_SNAPSHOT_OID_COLUMN: &str = "oid";+pub const AF_COLLAB_SNAPSHOT_ID_COLUMN: &str = "sid";+pub const AF_COLLAB_SNAPSHOT_BLOB_COLUMN: &str = "blob";+pub const AF_COLLAB_SNAPSHOT_BLOB_SIZE_COLUMN: &str = "blob_size";+pub const AF_COLLAB_SNAPSHOT_CREATED_AT_COLUMN: &str = "created_at";+pub const AF_COLLAB_SNAPSHOT_TABLE: &str = "af_collab_snapshot";++pub const USER_UUID: &str = "uuid";+pub const USER_UID: &str = "uid";+pub const OWNER_USER_UID: &str = "owner_uid";+pub const USER_EMAIL: &str = "email";+pub const USER_TABLE: &str = "af_user";+pub const WORKSPACE_TABLE: &str = "af_workspace";+pub const USER_PROFILE_VIEW: &str = "af_user_profile_view";++pub(crate) const WORKSPACE_ID: &str = "workspace_id";+pub(crate) const WORKSPACE_NAME: &str = "workspace_name";+pub(crate) const CREATED_AT: &str = "created_at";++pub fn table_name(ty: &CollabType) -> String {+ match ty {+ CollabType::DatabaseRow => format!("{}_database_row", AF_COLLAB_UPDATE_TABLE),+ CollabType::Document => format!("{}_document", AF_COLLAB_UPDATE_TABLE),+ CollabType::Database => format!("{}_database", AF_COLLAB_UPDATE_TABLE),+ CollabType::WorkspaceDatabase => format!("{}_w_database", AF_COLLAB_UPDATE_TABLE),+ CollabType::Folder => format!("{}_folder", AF_COLLAB_UPDATE_TABLE),+ }+}++pub fn partition_key(ty: &CollabType) -> i32 {+ ty.value()+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/entities.rs b/frontend/rust-lib/flowy-server/src/supabase/entities.rsindex 1eff97ed09..408d99966b 100644--- a/frontend/rust-lib/flowy-server/src/supabase/entities.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/entities.rs@@ -1,7 +1,6 @@use serde::Deserialize;use uuid::Uuid;-use crate::supabase::impls::WORKSPACE_ID;use crate::util::deserialize_null_or_default;pub enum GetUserProfileParams {@@ -20,20 +19,14 @@ pub(crate) struct UserProfileResponse {pub email: String,#[serde(deserialize_with = "deserialize_null_or_default")]- pub workspace_id: String,-}--impl From<tokio_postgres::Row> for UserProfileResponse {- fn from(row: tokio_postgres::Row) -> Self {- let workspace_id: Uuid = row.get(WORKSPACE_ID);- Self {- uid: row.get("uid"),- name: row.try_get("name").unwrap_or_default(),- email: row.try_get("email").unwrap_or_default(),- workspace_id: workspace_id.to_string(),- }- }+ pub latest_workspace_id: String,}#[derive(Debug, Deserialize)]pub(crate) struct UserProfileResponseList(pub Vec<UserProfileResponse>);++#[derive(Deserialize, Clone)]+pub(crate) struct UidResponse {+ #[allow(dead_code)]+ pub uid: i64,+}diff --git a/frontend/rust-lib/flowy-server/src/supabase/impls/collab_storage.rs b/frontend/rust-lib/flowy-server/src/supabase/impls/collab_storage.rsdeleted file mode 100644index 16eeaada51..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/impls/collab_storage.rs+++ /dev/null@@ -1,506 +0,0 @@-use std::future::Future;-use std::iter::Take;-use std::pin::Pin;-use std::sync::Weak;-use std::time::Duration;--use anyhow::Error;-use appflowy_integrate::{- merge_updates_v1, CollabObject, MsgId, RemoteCollabSnapshot, RemoteCollabState,- RemoteCollabStorage, RemoteUpdateReceiver,-};-use chrono::{DateTime, Utc};-use deadpool_postgres::GenericClient;-use futures::pin_mut;-use futures_util::{StreamExt, TryStreamExt};-use tokio::task::spawn_blocking;-use tokio_postgres::types::ToSql;-use tokio_postgres::Row;-use tokio_retry::strategy::FixedInterval;-use tokio_retry::{Action, Retry};--use flowy_database2::deps::{CollabObjectUpdate, CollabObjectUpdateByOid};-use lib_infra::async_trait::async_trait;-use lib_infra::util::md5;--use crate::supabase::postgres_db::PostgresObject;-use crate::supabase::sql_builder::{- DeleteSqlBuilder, InsertSqlBuilder, SelectSqlBuilder, WhereCondition,-};-use crate::supabase::{PostgresServer, SupabaseServerService};--pub struct PgCollabStorageImpl<T> {- server: T,-}--const AF_COLLAB_KEY_COLUMN: &str = "key";-const AF_COLLAB_SNAPSHOT_OID_COLUMN: &str = "oid";-const AF_COLLAB_SNAPSHOT_ID_COLUMN: &str = "sid";-const AF_COLLAB_SNAPSHOT_BLOB_COLUMN: &str = "blob";-const AF_COLLAB_SNAPSHOT_BLOB_SIZE_COLUMN: &str = "blob_size";-const AF_COLLAB_SNAPSHOT_CREATED_AT_COLUMN: &str = "created_at";-const AF_COLLAB_SNAPSHOT_TABLE: &str = "af_collab_snapshot";--impl<T> PgCollabStorageImpl<T>-where- T: SupabaseServerService,-{- pub fn new(server: T) -> Self {- Self { server }- }-- pub async fn get_client(&self) -> Option<PostgresObject> {- self- .server- .get_pg_server()?- .upgrade()?- .get_pg_client()- .await- .recv()- .await- .ok()- }-}--#[async_trait]-impl<T> RemoteCollabStorage for PgCollabStorageImpl<T>-where- T: SupabaseServerService,-{- fn is_enable(&self) -> bool {- self- .server- .get_pg_server()- .and_then(|server| server.upgrade())- .is_some()- }-- async fn get_all_updates(&self, object_id: &str) -> Result<Vec<Vec<u8>>, Error> {- let pg_server = self.server.try_get_pg_server()?;- let action = FetchObjectUpdateAction::new(object_id, pg_server);- let updates = action.run().await?;- Ok(updates)- }-- async fn get_latest_snapshot(- &self,- object_id: &str,- ) -> Result<Option<RemoteCollabSnapshot>, Error> {- match self.server.get_pg_server() {- None => Ok(None),- Some(weak_server) => get_latest_snapshot_from_server(object_id, weak_server).await,- }- }-- async fn get_collab_state(&self, object_id: &str) -> Result<Option<RemoteCollabState>, Error> {- let client = self.get_client().await;- if client.is_none() {- return Ok(None);- }-- let client = client.unwrap();- let (sql, params) = SelectSqlBuilder::new("af_collab_state")- .column("*")- .where_clause("oid", object_id.to_string())- .order_by("snapshot_created_at", false)- .limit(1)- .build();- let stmt = client.prepare_cached(&sql).await?;- if let Some(row) = client- .query_raw(&stmt, params)- .await?- .try_collect::<Vec<_>>()- .await?- .first()- {- let created_at = row.try_get::<&str, DateTime<Utc>>("snapshot_created_at")?;- let current_edit_count = row.try_get::<_, i64>("current_edit_count")?;- let last_snapshot_edit_count = row.try_get::<_, i64>("snapshot_edit_count")?;-- let state = RemoteCollabState {- current_edit_count,- last_snapshot_edit_count,- last_snapshot_created_at: created_at.timestamp(),- };- return Ok(Some(state));- }-- Ok(None)- }-- async fn create_snapshot(&self, object: &CollabObject, snapshot: Vec<u8>) -> Result<i64, Error> {- let client = self- .get_client()- .await- .ok_or_else(|| anyhow::anyhow!("Create snapshot failed. No client available"))?;- let value_size = snapshot.len() as i32;- let (sql, params) = InsertSqlBuilder::new("af_collab_snapshot")- .value(AF_COLLAB_SNAPSHOT_OID_COLUMN, object.id.clone())- .value("name", object.name.clone())- .value(AF_COLLAB_SNAPSHOT_BLOB_COLUMN, snapshot)- .value(AF_COLLAB_SNAPSHOT_BLOB_SIZE_COLUMN, value_size)- .returning(AF_COLLAB_SNAPSHOT_ID_COLUMN)- .build();- let stmt = client.prepare_cached(&sql).await?;-- let all_rows = client- .query_raw(&stmt, params)- .await?- .try_collect::<Vec<_>>()- .await?;- let row = all_rows- .first()- .ok_or(anyhow::anyhow!("Create snapshot failed. No row returned"))?;- let sid = row.try_get::<&str, i64>(AF_COLLAB_SNAPSHOT_ID_COLUMN)?;- return Ok(sid);- }-- async fn send_update(- &self,- object: &CollabObject,- _id: MsgId,- update: Vec<u8>,- ) -> Result<(), Error> {- if let Some(client) = self.get_client().await {- let value_size = update.len() as i32;- let md5 = md5(&update);- let (sql, params) = InsertSqlBuilder::new("af_collab")- .value("oid", object.id.clone())- .value("name", object.name.clone())- .value("value", update)- .value("uid", object.uid)- .value("md5", md5)- .value("value_size", value_size)- .build();-- let stmt = client.prepare_cached(&sql).await?;- client.execute_raw(&stmt, params).await?;- }- Ok(())- }-- async fn send_init_sync(- &self,- object: &CollabObject,- _id: MsgId,- init_update: Vec<u8>,- ) -> Result<(), Error> {- let client = self.get_client().await;- if client.is_none() {- return Ok(());- }-- let mut client = client.unwrap();- let txn = client.transaction().await?;-- // 1.Get all updates and lock the table. It means that a subsequent UPDATE, DELETE, or SELECT- // FOR UPDATE by this transaction will not result in a lock wait. other transactions that try- // to update or lock these specific rows will be blocked until the current transaction ends- let (sql, params) = SelectSqlBuilder::new("af_collab")- .column(AF_COLLAB_KEY_COLUMN)- .column("value")- .order_by(AF_COLLAB_KEY_COLUMN, true)- .where_clause("oid", object.id.clone())- .lock()- .build();-- let get_all_update_stmt = txn.prepare_cached(&sql).await?;- let row_stream = txn.query_raw(&get_all_update_stmt, params).await?;- let pg_rows = row_stream.try_collect::<Vec<_>>().await?;-- let insert_builder = InsertSqlBuilder::new("af_collab")- .value("oid", object.id.clone())- .value("uid", object.uid)- .value("name", object.name.clone());-- let (sql, params) = if !pg_rows.is_empty() {- let last_row_key = pg_rows- .last()- .map(|row| row.get::<_, i64>(AF_COLLAB_KEY_COLUMN))- .unwrap();-- // 2.Merge the updates into one and then delete the merged updates- let merge_result =- spawn_blocking(move || merge_update_from_rows(pg_rows, init_update)).await??;- tracing::trace!("Merged updates count: {}", merge_result.merged_keys.len());-- // 3. Delete merged updates- let (sql, params) = DeleteSqlBuilder::new("af_collab")- .where_condition(WhereCondition::Equals(- "oid".to_string(),- Box::new(object.id.clone()),- ))- .where_condition(WhereCondition::In(- AF_COLLAB_KEY_COLUMN.to_string(),- merge_result- .merged_keys- .into_iter()- .map(|key| Box::new(key) as Box<dyn ToSql + Send + Sync>)- .collect::<Vec<_>>(),- ))- .build();- let delete_stmt = txn.prepare_cached(&sql).await?;- txn.execute_raw(&delete_stmt, params).await?;-- // 4. Insert the merged update. The new_update contains the merged update and the- // init_update.- let new_update = merge_result.new_update;-- let value_size = new_update.len() as i32;- let md5 = md5(&new_update);- insert_builder- .value("value", new_update)- .value("value_size", value_size)- .value("md5", md5)- .value(AF_COLLAB_KEY_COLUMN, last_row_key)- .overriding_system_value()- .build()- } else {- let value_size = init_update.len() as i32;- let md5 = md5(&init_update);- insert_builder- .value("value", init_update)- .value("md5", md5)- .value("value_size", value_size)- .build()- };-- // 4.Insert the merged update- let stmt = txn.prepare_cached(&sql).await?;- txn.execute_raw(&stmt, params).await?;-- // 4.commit the transaction- txn.commit().await?;- tracing::trace!("{} init sync done", object.id);- Ok(())- }-- async fn subscribe_remote_updates(&self, _object: &CollabObject) -> Option<RemoteUpdateReceiver> {- // using pg_notify to subscribe to updates- None- }-}--pub async fn get_updates_from_server(- object_id: &str,- server: Weak<PostgresServer>,-) -> Result<Vec<Vec<u8>>, Error> {- match server.upgrade() {- None => Ok(vec![]),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- let (sql, params) = SelectSqlBuilder::new("af_collab")- .column("value")- .order_by(AF_COLLAB_KEY_COLUMN, true)- .where_clause("oid", object_id.to_string())- .build();- let stmt = client.prepare_cached(&sql).await?;- let row_stream = client.query_raw(&stmt, params).await?;- Ok(- row_stream- .try_collect::<Vec<_>>()- .await?- .into_iter()- .flat_map(|row| update_from_row(&row).ok())- .collect(),- )- },- }-}--pub async fn get_latest_snapshot_from_server(- object_id: &str,- server: Weak<PostgresServer>,-) -> Result<Option<RemoteCollabSnapshot>, Error> {- match server.upgrade() {- None => Ok(None),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- let (sql, params) = SelectSqlBuilder::new(AF_COLLAB_SNAPSHOT_TABLE)- .column(AF_COLLAB_SNAPSHOT_ID_COLUMN)- .column(AF_COLLAB_SNAPSHOT_BLOB_COLUMN)- .column(AF_COLLAB_SNAPSHOT_CREATED_AT_COLUMN)- .order_by(AF_COLLAB_SNAPSHOT_ID_COLUMN, false)- .limit(1)- .where_clause(AF_COLLAB_SNAPSHOT_OID_COLUMN, object_id.to_string())- .build();-- let stmt = client.prepare_cached(&sql).await?;- let all_rows = client- .query_raw(&stmt, params)- .await?- .try_collect::<Vec<_>>()- .await?;-- let row = all_rows.first().ok_or(anyhow::anyhow!(- "Get latest snapshot failed. No row returned"- ))?;- let snapshot_id = row.try_get::<_, i64>(AF_COLLAB_SNAPSHOT_ID_COLUMN)?;- let update = row.try_get::<_, Vec<u8>>(AF_COLLAB_SNAPSHOT_BLOB_COLUMN)?;- let created_at = row- .try_get::<_, DateTime<Utc>>(AF_COLLAB_SNAPSHOT_CREATED_AT_COLUMN)?- .timestamp();-- Ok(Some(RemoteCollabSnapshot {- snapshot_id,- oid: object_id.to_string(),- data: update,- created_at,- }))- },- }-}--fn update_from_row(row: &Row) -> Result<Vec<u8>, anyhow::Error> {- let update = row.try_get::<_, Vec<u8>>("value")?;- Ok(update)-}--fn merge_update_from_rows(- rows: Vec<Row>,- new_update: Vec<u8>,-) -> Result<MergeResult, anyhow::Error> {- let mut updates = vec![];- let mut merged_keys = vec![];- for row in rows {- merged_keys.push(row.try_get::<_, i64>(AF_COLLAB_KEY_COLUMN)?);- let update = update_from_row(&row)?;- updates.push(update);- }- updates.push(new_update);- let updates = updates- .iter()- .map(|update| update.as_ref())- .collect::<Vec<&[u8]>>();-- let new_update = merge_updates_v1(&updates)?;- Ok(MergeResult {- merged_keys,- new_update,- })-}--struct MergeResult {- merged_keys: Vec<i64>,- new_update: Vec<u8>,-}--pub struct FetchObjectUpdateAction {- object_id: String,- pg_server: Weak<PostgresServer>,-}--impl FetchObjectUpdateAction {- pub fn new(object_id: &str, pg_server: Weak<PostgresServer>) -> Self {- Self {- pg_server,- object_id: object_id.to_string(),- }- }-- pub fn run(self) -> Retry<Take<FixedInterval>, FetchObjectUpdateAction> {- let retry_strategy = FixedInterval::new(Duration::from_secs(5)).take(3);- Retry::spawn(retry_strategy, self)- }-- pub fn run_with_fix_interval(- self,- secs: u64,- times: usize,- ) -> Retry<Take<FixedInterval>, FetchObjectUpdateAction> {- let retry_strategy = FixedInterval::new(Duration::from_secs(secs)).take(times);- Retry::spawn(retry_strategy, self)- }-}--impl Action for FetchObjectUpdateAction {- type Future = Pin<Box<dyn Future<Output = Result<Self::Item, Self::Error>> + Send>>;- type Item = CollabObjectUpdate;- type Error = anyhow::Error;-- fn run(&mut self) -> Self::Future {- let weak_pb_server = self.pg_server.clone();- let object_id = self.object_id.clone();- Box::pin(async move {- match weak_pb_server.upgrade() {- None => Ok(vec![]),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- let (sql, params) = SelectSqlBuilder::new("af_collab")- .column("value")- .order_by(AF_COLLAB_KEY_COLUMN, true)- .where_clause("oid", object_id)- .build();- let stmt = client.prepare_cached(&sql).await?;- let row_stream = client.query_raw(&stmt, params).await?;- Ok(- row_stream- .try_collect::<Vec<_>>()- .await?- .into_iter()- .flat_map(|row| update_from_row(&row).ok())- .collect(),- )- },- }- })- }-}--pub struct BatchFetchObjectUpdateAction {- object_ids: Vec<String>,- pg_server: Weak<PostgresServer>,-}--impl BatchFetchObjectUpdateAction {- pub fn new(object_ids: Vec<String>, pg_server: Weak<PostgresServer>) -> Self {- Self {- pg_server,- object_ids,- }- }-- pub fn run(self) -> Retry<Take<FixedInterval>, BatchFetchObjectUpdateAction> {- let retry_strategy = FixedInterval::new(Duration::from_secs(5)).take(3);- Retry::spawn(retry_strategy, self)- }-}--impl Action for BatchFetchObjectUpdateAction {- type Future = Pin<Box<dyn Future<Output = Result<Self::Item, Self::Error>> + Send>>;- type Item = CollabObjectUpdateByOid;- type Error = anyhow::Error;-- fn run(&mut self) -> Self::Future {- let weak_pb_server = self.pg_server.clone();- let object_ids = self.object_ids.clone();- Box::pin(async move {- match weak_pb_server.upgrade() {- None => Ok(CollabObjectUpdateByOid::default()),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- let mut updates_by_oid = CollabObjectUpdateByOid::new();-- // Group the updates by oid- let (sql, params) = SelectSqlBuilder::new("af_collab")- .column("oid")- .array_agg("value")- .group_by("oid")- .where_clause_in("oid", object_ids)- .build();- let stmt = client.prepare_cached(&sql).await?;-- // Poll the rows- let rows = Box::pin(client.query_raw(&stmt, params).await?);- pin_mut!(rows);- while let Some(Ok(row)) = rows.next().await {- let oid = row.try_get::<_, String>("oid")?;- let updates = row.try_get::<_, Vec<Vec<u8>>>("value")?;- updates_by_oid.insert(oid, updates);- }- Ok(updates_by_oid)- },- }- })- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/impls/database.rs b/frontend/rust-lib/flowy-server/src/supabase/impls/database.rsdeleted file mode 100644index a2d89dd815..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/impls/database.rs+++ /dev/null@@ -1,107 +0,0 @@-use tokio::sync::oneshot::channel;--use flowy_database2::deps::{- CollabObjectUpdate, CollabObjectUpdateByOid, DatabaseCloudService, DatabaseSnapshot,-};-use flowy_error::{internal_error, FlowyError};-use lib_infra::future::FutureResult;--use crate::supabase::impls::{- get_latest_snapshot_from_server, BatchFetchObjectUpdateAction, FetchObjectUpdateAction,-};-use crate::supabase::SupabaseServerService;--pub struct SupabaseDatabaseCloudServiceImpl<T> {- server: T,-}--impl<T> SupabaseDatabaseCloudServiceImpl<T> {- pub fn new(server: T) -> Self {- Self { server }- }-}--impl<T> DatabaseCloudService for SupabaseDatabaseCloudServiceImpl<T>-where- T: SupabaseServerService,-{- fn get_collab_update(&self, object_id: &str) -> FutureResult<CollabObjectUpdate, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let database_id = object_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(CollabObjectUpdate::default()),- Some(weak_server) => {- FetchObjectUpdateAction::new(&database_id, weak_server)- .run()- .await- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)?.map_err(internal_error) })- }-- fn batch_get_collab_updates(- &self,- object_ids: Vec<String>,- ) -> FutureResult<CollabObjectUpdateByOid, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(CollabObjectUpdateByOid::default()),- Some(weak_server) => {- BatchFetchObjectUpdateAction::new(object_ids, weak_server)- .run()- .await- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)?.map_err(internal_error) })- }-- fn get_collab_latest_snapshot(- &self,- object_id: &str,- ) -> FutureResult<Option<DatabaseSnapshot>, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let database_id = object_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(None),- Some(weak_server) => get_latest_snapshot_from_server(&database_id, weak_server)- .await- .map_err(internal_error),- }- }- .await,- )- });- FutureResult::new(async {- Ok(- rx.await- .map_err(internal_error)??- .map(|snapshot| DatabaseSnapshot {- snapshot_id: snapshot.snapshot_id,- database_id: snapshot.oid,- data: snapshot.data,- created_at: snapshot.created_at,- }),- )- })- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/impls/document.rs b/frontend/rust-lib/flowy-server/src/supabase/impls/document.rsdeleted file mode 100644index 89520eb742..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/impls/document.rs+++ /dev/null@@ -1,108 +0,0 @@-use collab_document::document::Document;-use collab_folder::core::CollabOrigin;-use tokio::sync::oneshot::channel;--use flowy_document2::deps::{DocumentCloudService, DocumentData, DocumentSnapshot};-use flowy_error::{internal_error, FlowyError};-use lib_infra::future::FutureResult;--use crate::supabase::impls::{get_latest_snapshot_from_server, FetchObjectUpdateAction};-use crate::supabase::SupabaseServerService;--pub struct SupabaseDocumentCloudServiceImpl<T> {- server: T,-}--impl<T> SupabaseDocumentCloudServiceImpl<T> {- pub fn new(server: T) -> Self {- Self { server }- }-}--impl<T> DocumentCloudService for SupabaseDocumentCloudServiceImpl<T>-where- T: SupabaseServerService,-{- fn get_document_updates(&self, document_id: &str) -> FutureResult<Vec<Vec<u8>>, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let document_id = document_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(vec![]),- Some(weak_server) => FetchObjectUpdateAction::new(&document_id, weak_server)- .run_with_fix_interval(5, 5)- .await- .map_err(internal_error),- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-- fn get_document_latest_snapshot(- &self,- document_id: &str,- ) -> FutureResult<Option<DocumentSnapshot>, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let document_id = document_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(None),- Some(weak_server) => get_latest_snapshot_from_server(&document_id, weak_server)- .await- .map_err(internal_error),- }- }- .await,- )- });-- FutureResult::new(async {- {- Ok(- rx.await- .map_err(internal_error)??- .map(|snapshot| DocumentSnapshot {- snapshot_id: snapshot.snapshot_id,- document_id: snapshot.oid,- data: snapshot.data,- created_at: snapshot.created_at,- }),- )- }- })- }-- fn get_document_data(&self, document_id: &str) -> FutureResult<Option<DocumentData>, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let document_id = document_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(Ok(None)),- Some(weak_server) => {- let action = FetchObjectUpdateAction::new(&document_id, weak_server);- action.run().await.map(|updates| {- let document =- Document::from_updates(CollabOrigin::Empty, updates, &document_id, vec![])?;- Ok(document.get_document_data().ok())- })- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)?.map_err(internal_error)? })- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/impls/folder.rs b/frontend/rust-lib/flowy-server/src/supabase/impls/folder.rsdeleted file mode 100644index 75afe466d1..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/impls/folder.rs+++ /dev/null@@ -1,257 +0,0 @@-use chrono::{DateTime, Utc};-use collab_folder::core::{CollabOrigin, Folder};-use futures_util::{pin_mut, StreamExt};-use tokio::sync::oneshot::channel;-use uuid::Uuid;--use flowy_error::{internal_error, ErrorCode, FlowyError};-use flowy_folder2::deps::{FolderCloudService, FolderData, FolderSnapshot, Workspace};-use lib_infra::future::FutureResult;--use crate::supabase::impls::{- get_latest_snapshot_from_server, get_updates_from_server, FetchObjectUpdateAction,-};-use crate::supabase::postgres_db::PostgresObject;-use crate::supabase::sql_builder::{InsertSqlBuilder, SelectSqlBuilder};-use crate::supabase::SupabaseServerService;--pub(crate) const WORKSPACE_TABLE: &str = "af_workspace";-pub(crate) const WORKSPACE_ID: &str = "workspace_id";-const WORKSPACE_NAME: &str = "workspace_name";-const CREATED_AT: &str = "created_at";--pub struct SupabaseFolderCloudServiceImpl<T> {- server: T,-}--impl<T> SupabaseFolderCloudServiceImpl<T> {- pub fn new(server: T) -> Self {- Self { server }- }-}--impl<T> FolderCloudService for SupabaseFolderCloudServiceImpl<T>-where- T: SupabaseServerService,-{- fn create_workspace(&self, uid: i64, name: &str) -> FutureResult<Workspace, FlowyError> {- let weak_server = self.server.try_get_pg_server();- let (tx, rx) = channel();- let name = name.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server?.upgrade() {- None => Err(FlowyError::new(- ErrorCode::PgDatabaseError,- "Server is close",- )),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- create_workspace(&client, uid, &name).await- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-- fn get_folder_data(&self, workspace_id: &str) -> FutureResult<Option<FolderData>, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let workspace_id = workspace_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(Ok(None)),- Some(weak_server) => get_updates_from_server(&workspace_id, weak_server)- .await- .map(|updates| {- let folder = Folder::from_collab_raw_data(- CollabOrigin::Empty,- updates,- &workspace_id,- vec![],- )?;- Ok(folder.get_folder_data())- }),- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)?.map_err(internal_error)? })- }-- fn get_folder_latest_snapshot(- &self,- workspace_id: &str,- ) -> FutureResult<Option<FolderSnapshot>, FlowyError> {- let weak_server = self.server.get_pg_server();- let workspace_id = workspace_id.to_string();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async {- match weak_server {- None => Ok(None),- Some(weak_server) => get_latest_snapshot_from_server(&workspace_id, weak_server)- .await- .map_err(internal_error),- }- }- .await,- )- });- FutureResult::new(async {- Ok(- rx.await- .map_err(internal_error)??- .map(|snapshot| FolderSnapshot {- snapshot_id: snapshot.snapshot_id,- database_id: snapshot.oid,- data: snapshot.data,- created_at: snapshot.created_at,- }),- )- })- }-- fn get_folder_updates(- &self,- workspace_id: &str,- _uid: i64,- ) -> FutureResult<Vec<Vec<u8>>, FlowyError> {- let weak_server = self.server.get_pg_server();- let (tx, rx) = channel();- let workspace_id = workspace_id.to_string();- tokio::spawn(async move {- tx.send(- async move {- match weak_server {- None => Ok(vec![]),- Some(weak_server) => {- let action = FetchObjectUpdateAction::new(&workspace_id, weak_server);- action.run_with_fix_interval(5, 10).await- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)?.map_err(internal_error) })- }-- fn service_name(&self) -> String {- "Supabase".to_string()- }-}--async fn create_workspace(- client: &PostgresObject,- uid: i64,- name: &str,-) -> Result<Workspace, FlowyError> {- let new_workspace_id = Uuid::new_v4();-- // Create workspace- let (sql, params) = InsertSqlBuilder::new(WORKSPACE_TABLE)- .value("uid", uid)- .value(WORKSPACE_ID, new_workspace_id)- .value(WORKSPACE_NAME, name.to_string())- .build();- let stmt = client- .prepare_cached(&sql)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;- client- .execute_raw(&stmt, params)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;-- // Read the workspace- let (sql, params) = SelectSqlBuilder::new(WORKSPACE_TABLE)- .column(WORKSPACE_ID)- .column(WORKSPACE_NAME)- .column(CREATED_AT)- .where_clause(WORKSPACE_ID, new_workspace_id)- .build();- let stmt = client- .prepare_cached(&sql)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;-- let rows = Box::pin(- client- .query_raw(&stmt, params)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?,- );- pin_mut!(rows);-- if let Some(Ok(row)) = rows.next().await {- let created_at = row- .try_get::<&str, DateTime<Utc>>(CREATED_AT)- .unwrap_or_default();- let workspace_id: Uuid = row.get(WORKSPACE_ID);-- Ok(Workspace {- id: workspace_id.to_string(),- name: row.get(WORKSPACE_NAME),- child_views: Default::default(),- created_at: created_at.timestamp(),- })- } else {- Err(FlowyError::new(- ErrorCode::PgDatabaseError,- "Create workspace failed",- ))- }-}--#[cfg(test)]-mod tests {- use std::collections::HashMap;- use std::sync::Arc;-- use parking_lot::RwLock;- use uuid::Uuid;-- use flowy_folder2::deps::FolderCloudService;- use flowy_server_config::supabase_config::PostgresConfiguration;- use flowy_user::event_map::UserAuthService;- use lib_infra::box_any::BoxAny;-- use crate::supabase::impls::folder::SupabaseFolderCloudServiceImpl;- use crate::supabase::impls::SupabaseUserAuthServiceImpl;- use crate::supabase::{PostgresServer, SupabaseServerServiceImpl};-- #[tokio::test]- async fn create_user_workspace() {- if dotenv::from_filename("./.env.workspace.test").is_err() {- return;- }- let server = Arc::new(PostgresServer::new(- PostgresConfiguration::from_env().unwrap(),- ));- let weak_server = SupabaseServerServiceImpl(Arc::new(RwLock::new(Some(server.clone()))));- let user_service = SupabaseUserAuthServiceImpl::new(weak_server.clone());-- // create user- let mut params = HashMap::new();- params.insert("uuid".to_string(), Uuid::new_v4().to_string());- let user = user_service.sign_up(BoxAny::new(params)).await.unwrap();-- // create workspace- let folder_service = SupabaseFolderCloudServiceImpl::new(weak_server);- let workspace = folder_service- .create_workspace(user.user_id, "my test workspace")- .await- .unwrap();-- assert_eq!(workspace.name, "my test workspace");- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/impls/user.rs b/frontend/rust-lib/flowy-server/src/supabase/impls/user.rsdeleted file mode 100644index 5a259e9c12..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/impls/user.rs+++ /dev/null@@ -1,336 +0,0 @@-use std::str::FromStr;--use deadpool_postgres::GenericClient;-use futures::pin_mut;-use futures_util::StreamExt;-use tokio::sync::oneshot::channel;-use tokio_postgres::error::SqlState;-use uuid::Uuid;--use flowy_error::{internal_error, ErrorCode, FlowyError};-use flowy_user::entities::{SignInResponse, SignUpResponse, UpdateUserProfileParams, UserProfile};-use flowy_user::event_map::{UserAuthService, UserCredentials};-use flowy_user::services::{uuid_from_box_any, AuthType};-use lib_infra::box_any::BoxAny;-use lib_infra::future::FutureResult;--use crate::supabase::entities::{GetUserProfileParams, UserProfileResponse};-use crate::supabase::postgres_db::PostgresObject;-use crate::supabase::sql_builder::{SelectSqlBuilder, UpdateSqlBuilder};-use crate::supabase::SupabaseServerService;--pub(crate) const USER_TABLE: &str = "af_user";-pub(crate) const USER_PROFILE_TABLE: &str = "af_user_profile";-pub const USER_UUID: &str = "uuid";--pub struct SupabaseUserAuthServiceImpl<T> {- server: T,-}--impl<T> SupabaseUserAuthServiceImpl<T> {- pub fn new(server: T) -> Self {- Self { server }- }-}--impl<T> UserAuthService for SupabaseUserAuthServiceImpl<T>-where- T: SupabaseServerService,-{- fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, FlowyError> {- let weak_server = self.server.try_get_pg_server();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async move {- match weak_server?.upgrade() {- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- let params = uuid_from_box_any(params)?;- create_user_with_uuid(&client, params.uuid, params.email).await- },- None => Err(FlowyError::new(- ErrorCode::PgDatabaseError,- "Server is close",- )),- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-- fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, FlowyError> {- let server = self.server.try_get_pg_server();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async {- match server?.upgrade() {- None => Err(FlowyError::new(- ErrorCode::PgDatabaseError,- "Server is close",- )),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- let uuid = uuid_from_box_any(params)?.uuid;- let user_profile =- get_user_profile(&client, GetUserProfileParams::Uuid(uuid)).await?;- Ok(SignInResponse {- user_id: user_profile.uid,- workspace_id: user_profile.workspace_id,- ..Default::default()- })- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-- fn sign_out(&self, _token: Option<String>) -> FutureResult<(), FlowyError> {- FutureResult::new(async { Ok(()) })- }-- fn update_user(- &self,- _credential: UserCredentials,- params: UpdateUserProfileParams,- ) -> FutureResult<(), FlowyError> {- let weak_server = self.server.try_get_pg_server();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async move {- if let Some(server) = weak_server?.upgrade() {- let client = server.get_pg_client().await.recv().await?;- update_user_profile(&client, params).await- } else {- Ok(())- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-- fn get_user_profile(- &self,- credential: UserCredentials,- ) -> FutureResult<Option<UserProfile>, FlowyError> {- let weak_server = self.server.try_get_pg_server();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async move {- if let Some(server) = weak_server?.upgrade() {- let client = server.get_pg_client().await.recv().await?;- let uid = credential- .uid- .ok_or(FlowyError::new(ErrorCode::InvalidParams, "uid is required"))?;- let user_profile = get_user_profile(&client, GetUserProfileParams::Uid(uid))- .await- .ok()- .map(|user_profile| UserProfile {- id: user_profile.uid,- email: user_profile.email,- name: user_profile.name,- token: "".to_string(),- icon_url: "".to_string(),- openai_key: "".to_string(),- workspace_id: user_profile.workspace_id,- auth_type: AuthType::Supabase,- });- Ok(user_profile)- } else {- Ok(None)- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-- fn check_user(&self, credential: UserCredentials) -> FutureResult<(), FlowyError> {- let uuid = credential.uuid.and_then(|uuid| Uuid::from_str(&uuid).ok());- let weak_server = self.server.try_get_pg_server();- let (tx, rx) = channel();- tokio::spawn(async move {- tx.send(- async move {- match weak_server?.upgrade() {- None => Err(FlowyError::new(- ErrorCode::PgDatabaseError,- "Server is close",- )),- Some(server) => {- let client = server.get_pg_client().await.recv().await?;- check_user(&client, credential.uid, uuid).await- },- }- }- .await,- )- });- FutureResult::new(async { rx.await.map_err(internal_error)? })- }-}--async fn create_user_with_uuid(- client: &PostgresObject,- uuid: Uuid,- email: String,-) -> Result<SignUpResponse, FlowyError> {- let mut is_new = true;- if let Err(e) = client- .execute(- &format!("INSERT INTO {} (uuid, email) VALUES ($1,$2);", USER_TABLE),- &[&uuid, &email],- )- .await- {- if let Some(code) = e.code() {- if code == &SqlState::UNIQUE_VIOLATION {- is_new = false;- } else {- return Err(FlowyError::new(ErrorCode::PgDatabaseError, e));- }- }- };-- let user_profile = get_user_profile(client, GetUserProfileParams::Uuid(uuid)).await?;- Ok(SignUpResponse {- user_id: user_profile.uid,- name: user_profile.name,- workspace_id: user_profile.workspace_id,- is_new,- email: Some(user_profile.email),- token: None,- })-}--async fn get_user_profile(- client: &PostgresObject,- params: GetUserProfileParams,-) -> Result<UserProfileResponse, FlowyError> {- let rows = match params {- GetUserProfileParams::Uid(uid) => {- let stmt = client- .prepare_cached(&format!(- "SELECT * FROM {} WHERE uid = $1",- USER_PROFILE_TABLE- ))- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;-- client- .query(&stmt, &[&uid])- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?- },- GetUserProfileParams::Uuid(uuid) => {- let stmt = client- .prepare_cached(&format!(- "SELECT * FROM {} WHERE uuid = $1",- USER_PROFILE_TABLE- ))- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;-- client- .query(&stmt, &[&uuid])- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?- },- };-- let mut user_profiles = rows- .into_iter()- .map(UserProfileResponse::from)- .collect::<Vec<_>>();- if user_profiles.is_empty() {- Err(FlowyError::record_not_found())- } else {- Ok(user_profiles.remove(0))- }-}--async fn update_user_profile(- client: &PostgresObject,- params: UpdateUserProfileParams,-) -> Result<(), FlowyError> {- if params.is_empty() {- return Err(FlowyError::new(- ErrorCode::InvalidParams,- format!("Update user profile params is empty: {:?}", params),- ));- }- let (sql, pg_params) = UpdateSqlBuilder::new(USER_PROFILE_TABLE)- .set("name", params.name)- .set("email", params.email)- .where_clause("uid", params.id)- .build();-- let stmt = client.prepare_cached(&sql).await.map_err(|e| {- FlowyError::new(- ErrorCode::PgDatabaseError,- format!("Prepare update user profile sql error: {}", e),- )- })?;-- let affect_rows = client- .execute_raw(&stmt, pg_params)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;- tracing::trace!("Update user profile affect rows: {}", affect_rows);- Ok(())-}--async fn check_user(- client: &PostgresObject,- uid: Option<i64>,- uuid: Option<Uuid>,-) -> Result<(), FlowyError> {- if uid.is_none() && uuid.is_none() {- return Err(FlowyError::new(- ErrorCode::InvalidParams,- "uid and uuid can't be both empty",- ));- }-- let (sql, params) = match uid {- None => SelectSqlBuilder::new(USER_TABLE)- .where_clause("uuid", uuid.unwrap())- .build(),- Some(uid) => SelectSqlBuilder::new(USER_TABLE)- .where_clause("uid", uid)- .build(),- };-- let stmt = client- .prepare_cached(&sql)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?;- let rows = Box::pin(- client- .query_raw(&stmt, params)- .await- .map_err(|e| FlowyError::new(ErrorCode::PgDatabaseError, e))?,- );- pin_mut!(rows);-- // TODO(nathan): would it be better to use token.- if rows.next().await.is_some() {- Ok(())- } else {- Err(FlowyError::new(- ErrorCode::UserNotExist,- "Can't find the user in pg database",- ))- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/migration.rs b/frontend/rust-lib/flowy-server/src/supabase/migration.rsdeleted file mode 100644index 4668517406..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/migration.rs+++ /dev/null@@ -1,101 +0,0 @@-use refinery::embed_migrations;-use tokio_postgres::Client;--embed_migrations!("./src/supabase/migrations");--const AF_MIGRATION_HISTORY: &str = "af_migration_history";--pub(crate) async fn run_migrations(client: &mut Client) -> Result<(), anyhow::Error> {- match migrations::runner()- .set_migration_table_name(AF_MIGRATION_HISTORY)- .run_async(client)- .await- {- Ok(report) => {- if !report.applied_migrations().is_empty() {- tracing::info!("Run postgres db migration: {:?}", report);- }- Ok(())- },- Err(e) => {- tracing::error!("postgres db migration error: {}", e);- Err(anyhow::anyhow!("postgres db migration error: {}", e))- },- }-}--/// Drop all tables and dependencies defined in the v1_initial_up.sql.-/// Be careful when using this function. It will drop all tables and dependencies.-/// Mostly used for testing.-#[allow(dead_code)]-#[cfg(debug_assertions)]-pub(crate) async fn run_initial_drop(client: &Client) {- // let sql = include_str!("migrations/initial/initial_down.sql");- let sql = r#"DROP TABLE IF EXISTS af_user;-DROP TABLE IF EXISTS af_workspace;-DROP TABLE IF EXISTS af_user_profile;-DROP TABLE IF EXISTS af_collab;-DROP VIEW IF EXISTS af_collab_state;-DROP TABLE IF EXISTS af_collab_snapshot;-DROP TABLE IF EXISTS af_collab_statistics;--DROP TRIGGER IF EXISTS create_af_user_profile_trigger ON af_user_profile CASCADE;-DROP FUNCTION IF EXISTS create_af_user_profile_trigger_func;--DROP TRIGGER IF EXISTS create_af_workspace_trigger ON af_workspace CASCADE;-DROP FUNCTION IF EXISTS create_af_workspace_trigger_func;--DROP TRIGGER IF EXISTS af_collab_insert_trigger ON af_collab CASCADE;-DROP FUNCTION IF EXISTS increment_af_collab_update_count;--DROP TRIGGER IF EXISTS af_collab_snapshot_update_edit_count_trigger ON af_collab_snapshot;-DROP FUNCTION IF EXISTS af_collab_snapshot_update_edit_count;--DROP TRIGGER IF EXISTS check_and_delete_snapshots_trigger ON af_collab_snapshot CASCADE;-DROP FUNCTION IF EXISTS check_and_delete_snapshots;-"#;- client.batch_execute(sql).await.unwrap();- client- .batch_execute("DROP TABLE IF EXISTS af_migration_history")- .await- .unwrap();-}--#[cfg(test)]-mod tests {- use tokio_postgres::NoTls;-- use flowy_server_config::supabase_config::PostgresConfiguration;-- use crate::supabase::migration::run_initial_drop;-- // ‼️‼️‼️ Warning: this test will create a table in the database- #[tokio::test]- async fn test_postgres_db() -> Result<(), anyhow::Error> {- if dotenv::from_filename(".env.test").is_err() {- return Ok(());- }-- let configuration = PostgresConfiguration::from_env().unwrap();- let mut config = tokio_postgres::Config::new();- config- .host(&configuration.url)- .user(&configuration.user_name)- .password(&configuration.password)- .port(configuration.port);-- // Using the https://docs.rs/postgres-openssl/latest/postgres_openssl/ to enable tls connection.- let (client, connection) = config.connect(NoTls).await?;- tokio::spawn(async move {- if let Err(e) = connection.await {- tracing::error!("postgres db connection error: {}", e);- }- });-- #[cfg(debug_assertions)]- {- run_initial_drop(&client).await;- }- Ok(())- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/migrations/initial/Initial_down.sql b/frontend/rust-lib/flowy-server/src/supabase/migrations/initial/Initial_down.sqldeleted file mode 100644index 5db804e3de..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/migrations/initial/Initial_down.sql+++ /dev/null@@ -1,26 +0,0 @@-DROP TABLE IF EXISTS af_user;-DROP TABLE IF EXISTS af_workspace;-DROP TABLE IF EXISTS af_user_profile;-DROP TABLE IF EXISTS af_collab;-DROP VIEW IF EXISTS af_collab_state;-DROP TABLE IF EXISTS af_collab_snapshot;-DROP TABLE IF EXISTS af_collab_statistics;--DROP TRIGGER IF EXISTS create_af_user_profile_trigger ON af_user_profile CASCADE;-DROP FUNCTION IF EXISTS create_af_user_profile_trigger_func;--DROP TRIGGER IF EXISTS create_af_workspace_trigger ON af_workspace CASCADE;-DROP FUNCTION IF EXISTS create_af_workspace_trigger_func;--DROP TRIGGER IF EXISTS af_collab_insert_trigger ON af_collab CASCADE;-DROP FUNCTION IF EXISTS increment_af_collab_update_count;--DROP TRIGGER IF EXISTS af_collab_snapshot_update_edit_count_trigger ON af_collab_snapshot;-DROP FUNCTION IF EXISTS af_collab_snapshot_update_edit_count;--DROP TRIGGER IF EXISTS check_and_delete_snapshots_trigger ON af_collab_snapshot CASCADE;-DROP FUNCTION IF EXISTS check_and_delete_snapshots;--DROP TRIGGER IF EXISTS new_af_collab_row_trigger ON af_collab CASCADE;-DROP FUNCTION IF EXISTS notify_on_insert_af_collab;-diff --git a/frontend/rust-lib/flowy-server/src/supabase/migrations/initial/V1__Initial_Up.sql b/frontend/rust-lib/flowy-server/src/supabase/migrations/initial/V1__Initial_Up.sqldeleted file mode 100644index 76eb4a403f..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/migrations/initial/V1__Initial_Up.sql+++ /dev/null@@ -1,141 +0,0 @@--- user table-CREATE TABLE IF NOT EXISTS af_user (- uuid UUID PRIMARY KEY,- email TEXT DEFAULT '',- uid BIGINT GENERATED ALWAYS AS IDENTITY,- created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP-);--- user profile table-CREATE TABLE IF NOT EXISTS af_user_profile (- uid BIGINT PRIMARY KEY,- uuid UUID,- name TEXT,- email TEXT,- workspace_id UUID DEFAULT uuid_generate_v4()-);--- user_profile trigger-CREATE OR REPLACE FUNCTION create_af_user_profile_trigger_func() RETURNS TRIGGER AS $$ BEGIN-INSERT INTO af_user_profile (uid, uuid, email)-VALUES (NEW.uid, NEW.uuid, NEW.email);-RETURN NEW;-END $$ LANGUAGE plpgsql;-CREATE TRIGGER create_af_user_profile_trigger BEFORE-INSERT ON af_user FOR EACH ROW EXECUTE FUNCTION create_af_user_profile_trigger_func();--- workspace table-CREATE TABLE IF NOT EXISTS af_workspace (- workspace_id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),- uid BIGINT,- created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,- workspace_name TEXT DEFAULT 'My Workspace'-);--- workspace trigger-CREATE OR REPLACE FUNCTION create_af_workspace_trigger_func() RETURNS TRIGGER AS $$ BEGIN-INSERT INTO af_workspace (uid, workspace_id)-VALUES (NEW.uid, NEW.workspace_id);-RETURN NEW;-END $$ LANGUAGE plpgsql;-CREATE TRIGGER create_af_workspace_trigger BEFORE-INSERT ON af_user_profile FOR EACH ROW EXECUTE FUNCTION create_af_workspace_trigger_func();--- collab table.-CREATE TABLE IF NOT EXISTS af_collab (- oid TEXT NOT NULL,- name TEXT DEFAULT '',- key BIGINT GENERATED ALWAYS AS IDENTITY,- value BYTEA NOT NULL,- value_size INTEGER,- uid BIGINT NOT NULL,- md5 TEXT DEFAULT '',- created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,- PRIMARY KEY (oid, key)-);--- collab pg notify trigger. It will notify the frontend when a new row is inserted in the af_collab table.-CREATE OR REPLACE FUNCTION notify_on_insert_af_collab() RETURNS trigger AS $$-BEGIN- -- use pg_notify to send a notification- PERFORM pg_notify('new_row_in_af_collab', NEW.oid::text);-RETURN NEW;-END;-$$ LANGUAGE plpgsql;-CREATE TRIGGER new_af_collab_row_trigger- AFTER INSERT ON af_collab- FOR EACH ROW EXECUTE PROCEDURE notify_on_insert_af_collab();--- collab statistics. It will be used to store the edit_count of the collab.-CREATE TABLE IF NOT EXISTS af_collab_statistics (- oid TEXT PRIMARY KEY,- edit_count BIGINT NOT NULL DEFAULT 0-);--- collab statistics trigger. It will increment the edit_count of the collab when a new row is inserted in the af_collab table.-CREATE OR REPLACE FUNCTION increment_af_collab_edit_count() RETURNS TRIGGER AS $$ BEGIN IF EXISTS(- SELECT 1- FROM af_collab_statistics- WHERE oid = NEW.oid- ) THEN-UPDATE af_collab_statistics-SET edit_count = edit_count + 1-WHERE oid = NEW.oid;-ELSE-INSERT INTO af_collab_statistics (oid, edit_count)-VALUES (NEW.oid, 1);-END IF;-RETURN NEW;-END;-$$ LANGUAGE plpgsql;-CREATE TRIGGER af_collab_insert_trigger-AFTER-INSERT ON af_collab FOR EACH ROW EXECUTE FUNCTION increment_af_collab_edit_count();--- collab snapshot. It will be used to store the snapshots of the collab.-CREATE TABLE IF NOT EXISTS af_collab_snapshot (- sid BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,- oid TEXT NOT NULL,- name TEXT DEFAULT '',- blob BYTEA NOT NULL,- blob_size INTEGER NOT NULL,- edit_count BIGINT NOT NULL DEFAULT 0,- created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP-);--- auto insert edit_count in the snapshot table.-CREATE OR REPLACE FUNCTION af_collab_snapshot_update_edit_count() RETURNS TRIGGER AS $$ BEGIN NEW.edit_count := (- SELECT COALESCE(edit_count, 0)- FROM af_collab_statistics- WHERE oid = NEW.oid- );-RETURN NEW;-END;-$$ LANGUAGE plpgsql;-CREATE TRIGGER af_collab_snapshot_update_edit_count_trigger AFTER-INSERT ON af_collab_snapshot FOR EACH ROW EXECUTE FUNCTION af_collab_snapshot_update_edit_count();--- collab snapshot trigger. It will delete the oldest snapshot if the number of snapshots is greater than 20.--- It can use the PG_CRON extension to run this trigger periodically.-CREATE OR REPLACE FUNCTION check_and_delete_snapshots() RETURNS TRIGGER AS $$-DECLARE row_count INT;-BEGIN-SELECT COUNT(*) INTO row_count-FROM af_collab_snapshot-WHERE oid = NEW.oid;-IF row_count > 20 THEN-DELETE FROM af_collab_snapshot-WHERE id IN (- SELECT id- FROM af_collab_snapshot- WHERE created_at < NOW() - INTERVAL '10 days'- AND oid = NEW.oid- ORDER BY created_at ASC- LIMIT row_count - 20- );-END IF;-RETURN NEW;-END;-$$ LANGUAGE plpgsql;-CREATE TRIGGER check_and_delete_snapshots_trigger-AFTER-INSERT- OR-UPDATE ON af_collab_snapshot FOR EACH ROW EXECUTE FUNCTION check_and_delete_snapshots();--- collab state view. It will be used to get the current state of the collab.-CREATE VIEW af_collab_state AS-SELECT a.oid,- a.created_at AS snapshot_created_at,- a.edit_count AS snapshot_edit_count,- b.edit_count AS current_edit_count-FROM af_collab_snapshot AS a- JOIN af_collab_statistics AS b ON a.oid = b.oid;\ No newline at end of filediff --git a/frontend/rust-lib/flowy-server/src/supabase/mod.rs b/frontend/rust-lib/flowy-server/src/supabase/mod.rsindex 90f09e3a6b..0560b991bf 100644--- a/frontend/rust-lib/flowy-server/src/supabase/mod.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/mod.rs@@ -1,10 +1,8 @@pub use server::*;mod entities;-pub mod impls;-mod postgres_db;-mod sql_builder;-// mod postgres_http;-mod migration;-mod queue;+// pub mod storage_impls;+pub mod define;+// mod queue;+pub mod api;mod server;diff --git a/frontend/rust-lib/flowy-server/src/supabase/postgres_db.rs b/frontend/rust-lib/flowy-server/src/supabase/postgres_db.rsdeleted file mode 100644index f97bee3b4e..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/postgres_db.rs+++ /dev/null@@ -1,126 +0,0 @@-use std::cmp::Ordering;-use std::fmt::{Debug, Formatter};-use std::sync::Arc;--use deadpool_postgres::{Manager, ManagerConfig, Object, Pool, RecyclingMethod};-use tokio_postgres::NoTls;--use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_server_config::supabase_config::PostgresConfiguration;--use crate::supabase::migration::run_migrations;-use crate::supabase::queue::RequestPayload;--pub type PostgresObject = Object;-pub struct PostgresDB {- pub configuration: PostgresConfiguration,- pub client: Arc<Pool>,-}--impl PostgresDB {- #[allow(dead_code)]- pub async fn from_env() -> Result<Self, anyhow::Error> {- let configuration = PostgresConfiguration::from_env()?;- Self::new(configuration).await- }-- pub async fn new(configuration: PostgresConfiguration) -> Result<Self, anyhow::Error> {- // TODO(nathan): Handling connection surges using- // https://supabase.com/blog/supabase-pgbouncer- // https://supabase.com/docs/guides/database/connecting-to-postgres- let mut pg_config = tokio_postgres::Config::new();- pg_config- .host(&configuration.url)- .user(&configuration.user_name)- .password(&configuration.password)- .port(configuration.port);-- let mgr_config = ManagerConfig {- recycling_method: RecyclingMethod::Fast,- };-- // Using the https://docs.rs/postgres-openssl/latest/postgres_openssl/ to enable tls connection.- let mgr = Manager::from_config(pg_config, NoTls, mgr_config);- let pool = Pool::builder(mgr).max_size(16).build()?;- let mut client = pool.get().await?;- // Run migrations- run_migrations(&mut client).await?;-- Ok(Self {- configuration,- client: Arc::new(pool),- })- }-}--pub type PgClientSender = tokio::sync::mpsc::Sender<PostgresObject>;--pub struct PgClientReceiver(pub tokio::sync::mpsc::Receiver<PostgresObject>);-impl PgClientReceiver {- pub async fn recv(&mut self) -> FlowyResult<PostgresObject> {- match self.0.recv().await {- None => Err(FlowyError::new(- ErrorCode::PgConnectError,- "Can't connect to the postgres db".to_string(),- )),- Some(object) => Ok(object),- }- }-}--#[derive(Clone)]-pub enum PostgresEvent {- ConnectDB,- /// The ID is utilized to sequence the events within the priority queue.- /// The sender is employed for transmitting the PostgresObject back to the original sender.- /// At present, the sender is invoked subsequent to the processing of the previous PostgresObject.- /// For future optimizations, we could potentially perform batch processing of the [GetPgClient] events utilizing the [Pool].- GetPgClient {- id: u32,- sender: PgClientSender,- },-}--impl Debug for PostgresEvent {- fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {- match self {- PostgresEvent::ConnectDB => f.write_str("ConnectDB"),- PostgresEvent::GetPgClient { id, .. } => f.write_fmt(format_args!("GetPgClient({})", id)),- }- }-}--impl Ord for PostgresEvent {- fn cmp(&self, other: &Self) -> Ordering {- match (self, other) {- (PostgresEvent::ConnectDB, PostgresEvent::ConnectDB) => Ordering::Equal,- (PostgresEvent::ConnectDB, PostgresEvent::GetPgClient { .. }) => Ordering::Greater,- (PostgresEvent::GetPgClient { .. }, PostgresEvent::ConnectDB) => Ordering::Less,- (PostgresEvent::GetPgClient { id: id1, .. }, PostgresEvent::GetPgClient { id: id2, .. }) => {- id1.cmp(id2).reverse()- },- }- }-}--impl Eq for PostgresEvent {}--impl PartialEq<Self> for PostgresEvent {- fn eq(&self, other: &Self) -> bool {- match (self, other) {- (PostgresEvent::ConnectDB, PostgresEvent::ConnectDB) => true,- (PostgresEvent::GetPgClient { id: id1, .. }, PostgresEvent::GetPgClient { id: id2, .. }) => {- id1 == id2- },- _ => false,- }- }-}--impl PartialOrd<Self> for PostgresEvent {- fn partial_cmp(&self, other: &Self) -> Option<Ordering> {- Some(self.cmp(other))- }-}--impl RequestPayload for PostgresEvent {}diff --git a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/mod.rs b/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/mod.rsdeleted file mode 100644index 1daeed872d..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/mod.rs+++ /dev/null@@ -1,3 +0,0 @@-mod postgres_conn;-mod request;-mod response;diff --git a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/postgres_conn.rs b/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/postgres_conn.rsdeleted file mode 100644index 224a106049..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/postgres_conn.rs+++ /dev/null@@ -1,21 +0,0 @@-use std::sync::Arc;--use postgrest::Postgrest;--use crate::supabase::SupabaseConfiguration;--pub struct PostgresHttp {- pub postgres: Arc<Postgrest>,-}--impl PostgresHttp {- pub fn new(config: SupabaseConfiguration) -> Self {- let url = format!("{}/rest/v1/", config.url);- let auth = format!("Bearer {}", config.key);- let postgrest = Postgrest::new(url)- .insert_header("apikey", config.key)- .insert_header("Authorization", auth);- let postgres = Arc::new(postgrest);- Self { postgres }- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/request.rs b/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/request.rsdeleted file mode 100644index 44dc3a8f35..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/request.rs+++ /dev/null@@ -1,248 +0,0 @@-use std::sync::Arc;--use postgrest::Postgrest;-use serde_json::json;-use uuid::Uuid;--use flowy_error::{ErrorCode, FlowyError};-use flowy_folder2::deps::Workspace;-use flowy_user::entities::UpdateUserProfileParams;--use crate::supabase::entities::{- GetUserProfileParams, UserProfileResponse, UserProfileResponseList,-};-use crate::supabase::impls::{- USER_PROFILE_TABLE, USER_TABLE, WORKSPACE_NAME_COLUMN, WORKSPACE_TABLE,-};-use crate::supabase::postgres_http::response::{InsertResponse, PostgrestError, UserWorkspaceList};--const USER_ID: &str = "uid";-const USER_UUID: &str = "uuid";--pub(crate) async fn create_user_with_uuid(- postgrest: Arc<Postgrest>,- uuid: Uuid,-) -> Result<UserProfileResponse, FlowyError> {- let mut insert = serde_json::Map::new();- insert.insert(USER_UUID.to_string(), json!(&uuid.to_string()));- let insert_query = serde_json::to_string(&insert).unwrap();-- // Create a new user with uuid.- let resp = postgrest- .from(USER_TABLE)- .insert(insert_query)- .execute()- .await- .map_err(|e| FlowyError::new(ErrorCode::HttpError, e))?;-- // Check if the request is successful.- // If the request is successful, get the user id from the response. Otherwise, try to get the- // user id with uuid if the error is unique violation,- let is_success = resp.status().is_success();- let content = resp- .text()- .await- .map_err(|e| FlowyError::new(ErrorCode::UnexpectedEmpty, e))?;-- if is_success {- let record = serde_json::from_str::<InsertResponse>(&content)- .map_err(|e| FlowyError::serde().context(e))?- .first_or_error()?;-- get_user_profile(postgrest, GetUserProfileParams::Uid(record.uid)).await- } else {- let err = serde_json::from_str::<PostgrestError>(&content)- .map_err(|e| FlowyError::serde().context(e))?;-- // If there is a unique violation, try to get the user id with uuid. At this point, the user- // should exist.- if err.is_unique_violation() {- match get_user_profile(postgrest, GetUserProfileParams::Uuid(uuid)).await {- Ok(user) => Ok(user),- _ => Err(FlowyError::new(- ErrorCode::Internal,- "Failed to get user workspace",- )),- }- } else {- Err(FlowyError::new(ErrorCode::Internal, err))- }- }-}--#[allow(dead_code)]-pub(crate) async fn get_user_id_with_uuid(- postgrest: Arc<Postgrest>,- uuid: String,-) -> Result<Option<i64>, FlowyError> {- let resp = postgrest- .from(USER_TABLE)- .eq(USER_UUID, uuid)- .select("*")- .execute()- .await- .map_err(|e| FlowyError::new(ErrorCode::HttpError, e))?;-- let is_success = resp.status().is_success();- if !is_success {- return Err(FlowyError::new(- ErrorCode::Internal,- "Failed to get user id with uuid",- ));- }-- let content = resp- .text()- .await- .map_err(|e| FlowyError::new(ErrorCode::UnexpectedEmpty, e))?;- let resp = serde_json::from_str::<InsertResponse>(&content).unwrap();- if resp.0.is_empty() {- Ok(None)- } else {- Ok(Some(resp.0[0].uid))- }-}--pub(crate) async fn get_user_profile(- postgrest: Arc<Postgrest>,- params: GetUserProfileParams,-) -> Result<UserProfileResponse, FlowyError> {- let mut builder = postgrest.from(USER_PROFILE_TABLE);- match params {- GetUserProfileParams::Uid(uid) => builder = builder.eq(USER_ID, uid.to_string()),- GetUserProfileParams::Uuid(uuid) => builder = builder.eq(USER_UUID, uuid.to_string()),- }- let resp = builder- .select("*")- .execute()- .await- .map_err(|e| FlowyError::new(ErrorCode::HttpError, e))?;-- let content = resp- .text()- .await- .map_err(|e| FlowyError::new(ErrorCode::UnexpectedEmpty, e))?;- let mut user_profiles =- serde_json::from_str::<UserProfileResponseList>(&content).map_err(|_e| {- FlowyError::new(- ErrorCode::Serde,- "Deserialize UserProfileResponseList failed",- )- })?;- if user_profiles.0.is_empty() {- return Err(FlowyError::new(- ErrorCode::Internal,- "Failed to get user profile",- ));- }- Ok(user_profiles.0.remove(0))-}--pub(crate) async fn create_workspace_with_uid(- postgrest: Arc<Postgrest>,- uid: i64,- name: &str,-) -> Result<Workspace, FlowyError> {- let mut insert = serde_json::Map::new();- insert.insert(USER_ID.to_string(), json!(uid));- insert.insert(WORKSPACE_NAME_COLUMN.to_string(), json!(name));- let insert_query = serde_json::to_string(&insert).unwrap();-- let resp = postgrest- .from(WORKSPACE_TABLE)- .insert(insert_query)- .execute()- .await- .map_err(|e| FlowyError::new(ErrorCode::HttpError, e))?;-- let content = resp- .text()- .await- .map_err(|e| FlowyError::new(ErrorCode::UnexpectedEmpty, e))?;- let mut workspace_list = serde_json::from_str::<UserWorkspaceList>(&content)- .map_err(|_e| FlowyError::new(ErrorCode::Serde, "Deserialize UserWorkspaceList failed"))?- .into_inner();-- debug_assert!(workspace_list.len() == 1);- if workspace_list.is_empty() {- return Err(FlowyError::new(- ErrorCode::Internal,- "Failed to create workspace",- ));- }- let user_workspace = workspace_list.remove(0);- Ok(Workspace {- id: user_workspace.workspace_id,- name: user_workspace.workspace_name,- child_views: Default::default(),- created_at: user_workspace.created_at.timestamp(),- })-}--#[allow(dead_code)]-pub(crate) async fn get_user_workspace_with_uid(- postgrest: Arc<Postgrest>,- uid: i64,-) -> Result<Vec<Workspace>, FlowyError> {- let resp = postgrest- .from(WORKSPACE_TABLE)- .eq(USER_ID, uid.to_string())- .select("*")- .execute()- .await- .map_err(|e| FlowyError::new(ErrorCode::HttpError, e))?;-- let content = resp- .text()- .await- .map_err(|e| FlowyError::new(ErrorCode::UnexpectedEmpty, e))?;- let user_workspaces = serde_json::from_str::<UserWorkspaceList>(&content)- .map_err(|_e| FlowyError::new(ErrorCode::Serde, "Deserialize UserWorkspaceList failed"))?- .0;- Ok(- user_workspaces- .into_iter()- .map(|user_workspace| Workspace {- id: user_workspace.workspace_id,- name: user_workspace.workspace_name,- child_views: Default::default(),- created_at: user_workspace.created_at.timestamp(),- })- .collect(),- )-}--#[allow(dead_code)]-pub(crate) async fn update_user_profile(- postgrest: Arc<Postgrest>,- params: UpdateUserProfileParams,-) -> Result<Option<UserProfileResponse>, FlowyError> {- if params.is_empty() {- return Err(FlowyError::new(- ErrorCode::UnexpectedEmpty,- "Empty update params",- ));- }-- let mut update = serde_json::Map::new();- if let Some(name) = params.name {- update.insert("name".to_string(), json!(name));- }- let update_str = serde_json::to_string(&update).unwrap();- let resp = postgrest- .from(USER_PROFILE_TABLE)- .eq(USER_ID, params.id.to_string())- .update(update_str)- .execute()- .await- .map_err(|e| FlowyError::new(ErrorCode::HttpError, e))?;-- let content = resp- .text()- .await- .map_err(|e| FlowyError::new(ErrorCode::UnexpectedEmpty, e))?;-- let resp = serde_json::from_str::<UserProfileResponseList>(&content)- .map_err(|_e| FlowyError::new(ErrorCode::Serde, "Deserialize UserProfileList failed"))?;- Ok(resp.0.first().cloned())-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/response.rs b/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/response.rsdeleted file mode 100644index c4ec4751ea..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/postgres_deprecated/response.rs+++ /dev/null@@ -1,77 +0,0 @@-use chrono::{DateTime, Utc};-use serde::{Deserialize, Serialize};-use serde_json::Value;-use thiserror::Error;--use flowy_error::{ErrorCode, FlowyError};--use crate::util::deserialize_null_or_default;--#[derive(Debug, Error, Serialize, Deserialize)]-#[error(- "PostgrestException(message: {message}, code: {code:?}, details: {details:?}, hint: {hint:?})"-)]-pub struct PostgrestError {- message: String,- code: String,- details: Value,- hint: Option<String>,-}--impl PostgrestError {- /// Error code 23505 is a PostgreSQL error code. It signifies a "unique_violation", which occurs- /// when a certain unique constraint has been violated.- pub fn is_unique_violation(&self) -> bool {- self.code == "23505"- }-}--#[allow(dead_code)]-#[derive(Debug, Deserialize)]-pub struct PostgrestResponse {- data: Option<String>,- status: i32,- count: Option<i32>,-}--#[derive(Debug, Deserialize)]-pub(crate) struct InsertResponse(pub Vec<InsertRecord>);--impl InsertResponse {- pub(crate) fn first_or_error(&self) -> Result<InsertRecord, FlowyError> {- if self.0.is_empty() {- Err(FlowyError::new(- ErrorCode::UnexpectedEmpty,- "Insert response contains no records",- ))- } else {- Ok(self.0[0].clone())- }- }-}--#[derive(Debug, Deserialize, Clone)]-pub(crate) struct InsertRecord {- pub(crate) uid: i64,- #[allow(dead_code)]- pub(crate) uuid: String,-}--#[derive(Debug, Deserialize, Clone)]-pub(crate) struct UserWorkspace {- #[allow(dead_code)]- pub uid: i64,- #[serde(deserialize_with = "deserialize_null_or_default")]- pub workspace_name: String,- pub created_at: DateTime<Utc>,- pub workspace_id: String,-}--#[derive(Debug, Deserialize)]-pub(crate) struct UserWorkspaceList(pub(crate) Vec<UserWorkspace>);--impl UserWorkspaceList {- pub(crate) fn into_inner(self) -> Vec<UserWorkspace> {- self.0- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/server.rs b/frontend/rust-lib/flowy-server/src/supabase/server.rsindex 669456c596..3d2b744592 100644--- a/frontend/rust-lib/flowy-server/src/supabase/server.rs+++ b/frontend/rust-lib/flowy-server/src/supabase/server.rs@@ -1,65 +1,84 @@-use std::ops::Deref;-use std::sync::atomic::{AtomicU32, Ordering};-use std::sync::{Arc, Weak};-use std::time::Duration;+use std::sync::Arc;-use appflowy_integrate::RemoteCollabStorage;+use collab_plugins::cloud_storage::RemoteCollabStorage;use parking_lot::RwLock;-use tokio::spawn;-use tokio::sync::{watch, Mutex};-use tokio::time::interval;-use flowy_database2::deps::DatabaseCloudService;-use flowy_document2::deps::DocumentCloudService;-use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_folder2::deps::FolderCloudService;-use flowy_server_config::supabase_config::{PostgresConfiguration, SupabaseConfiguration};-use flowy_user::event_map::UserAuthService;-use lib_infra::async_trait::async_trait;+use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_document_deps::cloud::DocumentCloudService;+use flowy_folder_deps::cloud::FolderCloudService;+use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_user_deps::cloud::UserService;-use crate::supabase::impls::{- PgCollabStorageImpl, SupabaseDatabaseCloudServiceImpl, SupabaseDocumentCloudServiceImpl,- SupabaseFolderCloudServiceImpl, SupabaseUserAuthServiceImpl,-};-use crate::supabase::postgres_db::{PgClientReceiver, PostgresDB, PostgresEvent};-use crate::supabase::queue::{- PendingRequest, RequestHandler, RequestQueue, RequestRunner, RequestState,+use crate::supabase::api::{+ RESTfulPostgresServer, RESTfulSupabaseCollabStorageImpl, RESTfulSupabaseDatabaseServiceImpl,+ RESTfulSupabaseDocumentServiceImpl, RESTfulSupabaseFolderServiceImpl,+ RESTfulSupabaseUserAuthServiceImpl, SupabaseServerServiceImpl,};use crate::AppFlowyServer;+/// https://www.pgbouncer.org/features.html+/// Only support session mode.+///+/// Session mode:+/// When a new client connects, a connection is assigned to the client until it disconnects. Afterward,+/// the connection is returned back to the pool. All PostgreSQL features can be used with this option.+/// For the moment, the default pool size of pgbouncer in supabase is 15 in session mode. Which means+/// that we can have 15 concurrent connections to the database.+///+/// Transaction mode:+/// This is the suggested option for serverless functions. With this, the connection is only assigned+/// to the client for the duration of a transaction. Once done, the connection is returned to the pool.+/// Two consecutive transactions from the same client could be done over two, different connections.+/// Some session-based PostgreSQL features such as prepared statements are not available with this option.+/// A more comprehensive list of incompatible features can be found here.+///+/// Most of the case, Session mode is faster than Transaction mode(no statement cache(https://github.com/supabase/supavisor/issues/69) and queue transaction).+/// But Transaction mode is more suitable for serverless functions. It can reduce the number of concurrent+/// connections to the database.+/// TODO(nathan): fix prepared statement error when using transaction mode. https://github.com/prisma/prisma/issues/11643+///+#[derive(Clone, Debug, Default)]+pub enum PgPoolMode {+ #[default]+ Session,+ Transaction,+}++impl PgPoolMode {+ pub fn support_prepare_cached(&self) -> bool {+ matches!(self, PgPoolMode::Session)+ }+}/// Supabase server is used to provide the implementation of the [AppFlowyServer] trait./// It contains the configuration of the supabase server and the postgres server.pub struct SupabaseServer {#[allow(dead_code)]config: SupabaseConfiguration,- postgres: Arc<RwLock<Option<Arc<PostgresServer>>>>,+ restful_postgres: Arc<RwLock<Option<Arc<RESTfulPostgresServer>>>>,}impl SupabaseServer {pub fn new(config: SupabaseConfiguration) -> Self {- let postgres = if config.enable_sync {- Some(Arc::new(PostgresServer::new(- config.postgres_config.clone(),- )))+ let restful_postgres = if config.enable_sync {+ Some(Arc::new(RESTfulPostgresServer::new(config.clone())))} else {None};Self {config,- postgres: Arc::new(RwLock::new(postgres)),+ restful_postgres: Arc::new(RwLock::new(restful_postgres)),}}pub fn set_enable_sync(&self, enable: bool) {if enable {- if self.postgres.read().is_some() {+ if self.restful_postgres.read().is_some() {return;}- *self.postgres.write() = Some(Arc::new(PostgresServer::new(- self.config.postgres_config.clone(),- )));+ *self.restful_postgres.write() =+ Some(Arc::new(RESTfulPostgresServer::new(self.config.clone())));} else {- *self.postgres.write() = None;+ *self.restful_postgres.write() = None;}}}@@ -70,194 +89,33 @@ impl AppFlowyServer for SupabaseServer {self.set_enable_sync(enable);}- fn user_service(&self) -> Arc<dyn UserAuthService> {- Arc::new(SupabaseUserAuthServiceImpl::new(SupabaseServerServiceImpl(- self.postgres.clone(),- )))+ fn user_service(&self) -> Arc<dyn UserService> {+ Arc::new(RESTfulSupabaseUserAuthServiceImpl::new(+ SupabaseServerServiceImpl(self.restful_postgres.clone()),+ ))}fn folder_service(&self) -> Arc<dyn FolderCloudService> {- Arc::new(SupabaseFolderCloudServiceImpl::new(- SupabaseServerServiceImpl(self.postgres.clone()),+ Arc::new(RESTfulSupabaseFolderServiceImpl::new(+ SupabaseServerServiceImpl(self.restful_postgres.clone()),))}fn database_service(&self) -> Arc<dyn DatabaseCloudService> {- Arc::new(SupabaseDatabaseCloudServiceImpl::new(- SupabaseServerServiceImpl(self.postgres.clone()),+ Arc::new(RESTfulSupabaseDatabaseServiceImpl::new(+ SupabaseServerServiceImpl(self.restful_postgres.clone()),))}fn document_service(&self) -> Arc<dyn DocumentCloudService> {- Arc::new(SupabaseDocumentCloudServiceImpl::new(- SupabaseServerServiceImpl(self.postgres.clone()),+ Arc::new(RESTfulSupabaseDocumentServiceImpl::new(+ SupabaseServerServiceImpl(self.restful_postgres.clone()),))}fn collab_storage(&self) -> Option<Arc<dyn RemoteCollabStorage>> {- Some(Arc::new(PgCollabStorageImpl::new(- SupabaseServerServiceImpl(self.postgres.clone()),+ Some(Arc::new(RESTfulSupabaseCollabStorageImpl::new(+ SupabaseServerServiceImpl(self.restful_postgres.clone()),)))}}--/// [SupabaseServerService] is used to provide supabase services. The caller can using this trait-/// to get the services and it might need to handle the situation when the services is unavailable.-/// For example, when user stop syncing, the services will be unavailable or when the user is logged-/// out.-pub trait SupabaseServerService: Send + Sync + 'static {- fn get_pg_server(&self) -> Option<Weak<PostgresServer>>;-- fn try_get_pg_server(&self) -> FlowyResult<Weak<PostgresServer>>;-}--#[derive(Clone)]-pub struct SupabaseServerServiceImpl(pub Arc<RwLock<Option<Arc<PostgresServer>>>>);-impl SupabaseServerService for SupabaseServerServiceImpl {- /// Get the postgres server, if the postgres server is not available, return None.- fn get_pg_server(&self) -> Option<Weak<PostgresServer>> {- self.0.read().as_ref().map(Arc::downgrade)- }-- /// Try to get the postgres server, if the postgres server is not available, return an error.- fn try_get_pg_server(&self) -> FlowyResult<Weak<PostgresServer>> {- self.0.read().as_ref().map(Arc::downgrade).ok_or_else(|| {- FlowyError::new(- ErrorCode::SupabaseSyncRequired,- "Supabase sync is disabled, please enable it first",- )- })- }-}--pub struct PostgresServer {- request_handler: Arc<PostgresRequestHandler>,-}--impl Deref for PostgresServer {- type Target = Arc<PostgresRequestHandler>;-- fn deref(&self) -> &Self::Target {- &self.request_handler- }-}--impl PostgresServer {- pub fn new(config: PostgresConfiguration) -> Self {- let (runner_notifier_tx, runner_notifier) = watch::channel(false);- let request_handler = Arc::new(PostgresRequestHandler::new(runner_notifier_tx, config));-- // Initialize the connection to the database- let conn = PendingRequest::new(PostgresEvent::ConnectDB);- request_handler.queue.lock().push(conn);- let handler = Arc::downgrade(&request_handler) as Weak<dyn RequestHandler<PostgresEvent>>;- spawn(RequestRunner::run(runner_notifier, handler));-- Self { request_handler }- }-}--pub struct PostgresRequestHandler {- config: PostgresConfiguration,- db: Arc<Mutex<Option<Arc<PostgresDB>>>>,- queue: parking_lot::Mutex<RequestQueue<PostgresEvent>>,- runner_notifier: Arc<watch::Sender<bool>>,- sequence: AtomicU32,-}--impl PostgresRequestHandler {- pub fn new(runner_notifier: watch::Sender<bool>, config: PostgresConfiguration) -> Self {- let db = Arc::new(Default::default());- let queue = parking_lot::Mutex::new(RequestQueue::new());- let runner_notifier = Arc::new(runner_notifier);- Self {- db,- queue,- runner_notifier,- config,- sequence: Default::default(),- }- }-- pub async fn get_pg_client(&self) -> PgClientReceiver {- let (tx, rx) = tokio::sync::mpsc::channel(1);- let mut queue = self.queue.lock();-- let event = PostgresEvent::GetPgClient {- id: self.sequence.fetch_add(1, Ordering::SeqCst),- sender: tx,- };- let request = PendingRequest::new(event);- queue.push(request);- self.notify();- PgClientReceiver(rx)- }-}--#[async_trait]-impl RequestHandler<PostgresEvent> for PostgresRequestHandler {- async fn prepare_request(&self) -> Option<PendingRequest<PostgresEvent>> {- match self.queue.try_lock() {- None => {- // If acquire the lock failed, try after 300ms- let weak_notifier = Arc::downgrade(&self.runner_notifier);- spawn(async move {- interval(Duration::from_millis(300)).tick().await;- if let Some(notifier) = weak_notifier.upgrade() {- let _ = notifier.send(false);- }- });- None- },- Some(queue) => queue.peek().cloned(),- }- }-- async fn handle_request(&self, request: PendingRequest<PostgresEvent>) -> Option<()> {- debug_assert!(Some(&request) == self.queue.lock().peek());-- match request.payload {- PostgresEvent::ConnectDB => {- let is_connected = self.db.lock().await.is_some();- if is_connected {- tracing::warn!("Already connect to postgres db");- } else {- tracing::info!("Start connecting to postgres db");- match PostgresDB::new(self.config.clone()).await {- Ok(db) => {- *self.db.lock().await = Some(Arc::new(db));- if let Some(mut request) = self.queue.lock().pop() {- request.set_state(RequestState::Done);- }- },- Err(e) => tracing::error!("Error connecting to the postgres db: {}", e),- }- }- },- PostgresEvent::GetPgClient { id: _, sender } => {- match self.db.lock().await.as_ref().map(|db| db.client.clone()) {- None => tracing::error!("Can't get the postgres client"),- Some(pool) => {- match pool.get().await {- Ok(object) => {- if let Err(e) = sender.send(object).await {- tracing::error!("Error sending the postgres client: {}", e);- }- },- Err(e) => tracing::error!("Get postgres client failed: {}", e),- }-- if let Some(mut request) = self.queue.lock().pop() {- request.set_state(RequestState::Done);- }- },- }- },- }- None- }-- fn notify(&self) {- let _ = self.runner_notifier.send(false);- }-}diff --git a/frontend/rust-lib/flowy-server/src/supabase/sql_builder.rs b/frontend/rust-lib/flowy-server/src/supabase/sql_builder.rsdeleted file mode 100644index f29f7769b0..0000000000--- a/frontend/rust-lib/flowy-server/src/supabase/sql_builder.rs+++ /dev/null@@ -1,308 +0,0 @@-use tokio_postgres::types::ToSql;--pub struct UpdateSqlBuilder {- table: String,- sets: Vec<(String, Box<dyn ToSql + Sync + Send>)>,- where_clause: Option<(String, Box<dyn ToSql + Sync + Send>)>,-}--impl UpdateSqlBuilder {- pub fn new(table: &str) -> Self {- Self {- table: table.to_string(),- sets: Vec::new(),- where_clause: None,- }- }-- pub fn set<T: 'static + ToSql + Sync + Send>(mut self, column: &str, value: Option<T>) -> Self {- if let Some(value) = value {- self.sets.push((column.to_string(), Box::new(value)));- }- self- }-- pub fn where_clause<T: 'static + ToSql + Sync + Send>(mut self, clause: &str, value: T) -> Self {- self.where_clause = Some((clause.to_string(), Box::new(value)));- self- }-- pub fn build(self) -> (String, Vec<Box<dyn ToSql + Sync + Send>>) {- let mut sql = format!("UPDATE {} SET ", self.table);-- for i in 0..self.sets.len() {- if i > 0 {- sql.push_str(", ");- }- sql.push_str(&format!("{} = ${}", self.sets[i].0, i + 1));- }-- let mut params: Vec<_> = self.sets.into_iter().map(|(_, value)| value).collect();-- if let Some((clause, value)) = self.where_clause {- sql.push_str(&format!(" WHERE {} = ${}", clause, params.len() + 1));- params.push(value);- }-- (sql, params)- }-}--pub struct SelectSqlBuilder {- table: String,- columns: Vec<String>,- where_clause: Option<(String, Box<dyn ToSql + Sync + Send>)>,- where_clause_in: Option<(String, Vec<Box<dyn ToSql + Sync + Send>>)>,- group_by_column: Option<String>,- order_by: Option<(String, bool)>,- limit: Option<i64>,- lock: bool,- array_agg_columns: Vec<String>,-}--impl SelectSqlBuilder {- pub fn new(table: &str) -> Self {- Self {- table: table.to_string(),- columns: Vec::new(),- where_clause: None,- where_clause_in: None,- group_by_column: None,- order_by: None,- limit: None,- lock: false,- array_agg_columns: vec![],- }- }-- pub fn lock(mut self) -> Self {- self.lock = true;- self- }-- pub fn column(mut self, column: &str) -> Self {- self.columns.push(column.to_string());- self- }-- pub fn group_by(mut self, column: &str) -> Self {- self.group_by_column = Some(column.to_string());- self- }-- pub fn array_agg(mut self, column: &str) -> Self {- self.array_agg_columns.push(column.to_string());- self- }-- pub fn order_by(mut self, column: &str, asc: bool) -> Self {- self.order_by = Some((column.to_string(), asc));- self- }-- pub fn where_clause<T: 'static + ToSql + Sync + Send>(mut self, clause: &str, value: T) -> Self {- self.where_clause = Some((clause.to_string(), Box::new(value)));- self- }-- pub fn where_clause_in<T: 'static + ToSql + Sync + Send>(- mut self,- clause: &str,- values: Vec<T>,- ) -> Self {- let boxed_values: Vec<_> = values- .into_iter()- .map(|value| Box::new(value) as Box<dyn ToSql + Send + Sync>)- .collect();- self.where_clause_in = Some((clause.to_string(), boxed_values));- self- }-- pub fn limit(mut self, limit: i64) -> Self {- self.limit = Some(limit);- self- }-- pub fn build(self) -> (String, Vec<Box<dyn ToSql + Sync + Send>>) {- let all_columns = self- .columns- .iter()- .chain(self.array_agg_columns.iter())- .cloned()- .collect::<Vec<_>>()- .join(", ");- let mut sql = format!("SELECT {} FROM {}", all_columns, self.table);-- let mut params: Vec<_> = Vec::new();- if let Some((clause, value)) = self.where_clause {- sql.push_str(&format!(" WHERE {} = ${}", clause, params.len() + 1));- params.push(value);- }-- if let Some((clause, values)) = self.where_clause_in {- let placeholders: Vec<String> = values- .iter()- .enumerate()- .map(|(i, _)| format!("${}", i + 1))- .collect();- sql.push_str(&format!(- " WHERE {} IN ({})",- clause,- placeholders.join(",")- ));- params.extend(values);- }-- if let Some(group_by_column) = self.group_by_column {- sql.push_str(&format!(" GROUP BY {}", group_by_column));- }-- if let Some((order_by_column, asc)) = self.order_by {- let order = if asc { "ASC" } else { "DESC" };- sql.push_str(&format!(" ORDER BY {} {}", order_by_column, order));- }-- // ARRAY_AGG is an aggregate function that concatenates the values from column_name- // into an array.- for array_agg_column in self.array_agg_columns {- sql = sql.replace(- &array_agg_column,- &format!("ARRAY_AGG({}) as {}", array_agg_column, array_agg_column),- );- }-- if let Some(limit) = self.limit {- sql.push_str(&format!(" LIMIT {}", limit));- }-- if self.lock {- sql.push_str(" FOR UPDATE");- }-- (sql, params)- }-}--pub struct InsertSqlBuilder {- table: String,- columns: Vec<String>,- values: Vec<Box<(dyn ToSql + Sync + Send + 'static)>>,- override_system_value: bool,- returning: Vec<String>, // Vec for returning multiple columns-}--impl InsertSqlBuilder {- pub fn new(table: &str) -> Self {- Self {- table: table.to_string(),- columns: Vec::new(),- values: Vec::new(),- override_system_value: false,- returning: vec![],- }- }-- pub fn value<T: ToSql + Sync + Send + 'static>(mut self, column: &str, value: T) -> Self {- self.columns.push(column.to_string());- self.values.push(Box::new(value));- self- }-- pub fn overriding_system_value(mut self) -> Self {- self.override_system_value = true;- self- }-- pub fn returning(mut self, column: &str) -> Self {- // add column to return- self.returning.push(column.to_string());- self- }-- pub fn build(self) -> (String, Vec<Box<(dyn ToSql + Sync + Send)>>) {- let mut query = format!("INSERT INTO {} (", self.table);- query.push_str(&self.columns.join(", "));- query.push(')');-- if self.override_system_value {- query.push_str(" OVERRIDING SYSTEM VALUE");- }-- query.push_str(" VALUES (");- query.push_str(- &(0..self.columns.len())- .map(|i| format!("${}", i + 1))- .collect::<Vec<_>>()- .join(", "),- );- query.push(')');-- if !self.returning.is_empty() {- // add RETURNING clause if there are columns to return- query.push_str(&format!(" RETURNING {}", self.returning.join(", ")));- }-- (query, self.values)- }-}--pub enum WhereCondition {- Equals(String, Box<dyn ToSql + Sync + Send>),- In(String, Vec<Box<dyn ToSql + Sync + Send>>),-}--pub struct DeleteSqlBuilder {- table: String,- conditions: Vec<WhereCondition>,-}--impl DeleteSqlBuilder {- pub fn new(table: &str) -> Self {- Self {- table: table.to_string(),- conditions: Vec::new(),- }- }-- pub fn where_condition(mut self, condition: WhereCondition) -> Self {- self.conditions.push(condition);- self- }-- pub fn build(self) -> (String, Vec<Box<dyn ToSql + Sync + Send>>) {- let mut sql = format!("DELETE FROM {}", self.table);- let mut params: Vec<Box<dyn ToSql + Sync + Send>> = Vec::new();-- if !self.conditions.is_empty() {- sql.push_str(" WHERE ");- let condition_len = self.conditions.len();- for (i, condition) in self.conditions.into_iter().enumerate() {- match condition {- WhereCondition::Equals(column, value) => {- sql.push_str(&format!(- "{} = ${}{}",- column,- params.len() + 1,- if i < condition_len - 1 { " AND " } else { "" },- ));- params.push(value);- },- WhereCondition::In(column, values) => {- let placeholders: Vec<String> = (1..=values.len())- .map(|i| format!("${}", i + params.len()))- .collect();- sql.push_str(&format!(- "{} IN ({}){}",- column,- placeholders.join(", "),- if i < condition_len - 1 { " AND " } else { "" },- ));- params.extend(values);- },- }- }- }-- (sql, params)- }-}diff --git a/frontend/rust-lib/flowy-server/tests/main.rs b/frontend/rust-lib/flowy-server/tests/main.rsindex edbbb44472..819ec4faf0 100644--- a/frontend/rust-lib/flowy-server/tests/main.rs+++ b/frontend/rust-lib/flowy-server/tests/main.rs@@ -9,7 +9,7 @@ mod supabase_test;pub fn setup_log() {static START: Once = Once::new();START.call_once(|| {- let level = "trace";+ let level = "debug";let mut filters = vec![];filters.push(format!("flowy_server={}", level));std::env::set_var("RUST_LOG", filters.join(","));diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rsnew file mode 100644index 0000000000..258467e32b--- /dev/null+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/database_test.rs@@ -0,0 +1,53 @@+use crate::supabase_test::util::{+ collab_service, database_service, get_supabase_config, sign_up_param, user_auth_service,+};+use collab_plugins::cloud_storage::{CollabObject, CollabType};+use flowy_user_deps::entities::SignUpResponse;+use lib_infra::box_any::BoxAny;+use uuid::Uuid;++#[tokio::test]+async fn supabase_create_workspace_test() {+ if get_supabase_config().is_none() {+ return;+ }++ let user_service = user_auth_service();+ let uuid = Uuid::new_v4().to_string();+ let params = sign_up_param(uuid);+ let user: SignUpResponse = user_service.sign_up(BoxAny::new(params)).await.unwrap();++ let collab_service = collab_service();+ let database_service = database_service();++ let mut row_ids = vec![];+ for _i in 0..3 {+ let row_id = uuid::Uuid::new_v4().to_string();+ row_ids.push(row_id.clone());+ let collab_object = CollabObject {+ id: row_id,+ uid: user.user_id,+ ty: CollabType::DatabaseRow,+ meta: Default::default(),+ }+ .with_workspace_id(user.latest_workspace.id.clone());+ collab_service+ .send_update(&collab_object, 0, vec![1, 2, 3])+ .await+ .unwrap();+ collab_service+ .send_update(&collab_object, 0, vec![4, 5, 6])+ .await+ .unwrap();+ }++ let updates_by_oid = database_service+ .batch_get_collab_updates(row_ids, CollabType::DatabaseRow)+ .await+ .unwrap();++ assert_eq!(updates_by_oid.len(), 3);+ for (_, update) in updates_by_oid {+ assert_eq!(update.len(), 2);+ }+}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.rsnew file mode 100644index 0000000000..b97dff1640--- /dev/null+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/folder_test.rs@@ -0,0 +1,100 @@+use crate::supabase_test::util::{+ collab_service, folder_service, get_supabase_config, sign_up_param, user_auth_service,+};+use collab_plugins::cloud_storage::{CollabObject, CollabType};+use flowy_user_deps::entities::SignUpResponse;+use futures::future::join_all;+use lib_infra::box_any::BoxAny;++use tokio::task;+use uuid::Uuid;+use yrs::{Doc, Map, ReadTxn, StateVector, Transact};++#[tokio::test]+async fn supabase_create_workspace_test() {+ if get_supabase_config().is_none() {+ return;+ }++ let service = folder_service();+ // will replace the uid with the real uid+ let workspace = service.create_workspace(1, "test").await.unwrap();+ dbg!(workspace);+}++#[tokio::test]+async fn supabase_get_folder_test() {+ if get_supabase_config().is_none() {+ return;+ }++ let folder_service = folder_service();+ let user_service = user_auth_service();+ let collab_service = collab_service();+ let uuid = Uuid::new_v4().to_string();+ let params = sign_up_param(uuid);+ let user: SignUpResponse = user_service.sign_up(BoxAny::new(params)).await.unwrap();++ let collab_object = CollabObject {+ id: user.latest_workspace.id.clone(),+ uid: user.user_id,+ ty: CollabType::Folder,+ meta: Default::default(),+ }+ .with_workspace_id(user.latest_workspace.id.clone());++ let doc = Doc::with_client_id(1);+ let map = { doc.get_or_insert_map("map") };+ {+ let mut txn = doc.transact_mut();+ map.insert(&mut txn, "1", "a");+ collab_service+ .send_update(&collab_object, 0, txn.encode_update_v1())+ .await+ .unwrap();+ };++ {+ let mut txn = doc.transact_mut();+ map.insert(&mut txn, "2", "b");+ collab_service+ .send_update(&collab_object, 1, txn.encode_update_v1())+ .await+ .unwrap();+ };++ // let updates = collab_service.get_all_updates(&collab_object).await.unwrap();+ let updates = folder_service+ .get_folder_updates(&user.latest_workspace.id, user.user_id)+ .await+ .unwrap();+ assert_eq!(updates.len(), 2);++ // The init sync will try to merge the updates into one.+ let mut handles = Vec::new();+ for _ in 0..5 {+ let cloned_collab_service = collab_service.clone();+ let cloned_collab_object = collab_object.clone();+ let handle = task::spawn(async move {+ cloned_collab_service+ .send_init_sync(&cloned_collab_object, 3, vec![])+ .await+ .unwrap();+ });+ handles.push(handle);+ }+ let _results: Vec<_> = join_all(handles).await;+ let remote_update = folder_service+ .get_folder_updates(&user.latest_workspace.id, user.user_id)+ .await+ .unwrap()+ .first()+ .unwrap()+ .clone();+ let expected_update = doc+ .transact_mut()+ .encode_state_as_update_v1(&StateVector::default());++ // check the update is the same as local document update.+ assert_eq!(remote_update, expected_update);+}diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/mod.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/mod.rsindex 3e9a615104..f59e3788f4 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/mod.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/mod.rs@@ -1 +1,4 @@+mod database_test;+mod folder_test;mod user_test;+mod util;diff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rsindex cbe92a25d6..21522f4f09 100644--- a/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/user_test.rs@@ -1,67 +1,51 @@-use std::collections::HashMap;-use std::sync::Arc;--use parking_lot::RwLock;use uuid::Uuid;-use flowy_server::supabase::impls::{SupabaseUserAuthServiceImpl, USER_UUID};-use flowy_server::supabase::{PostgresServer, SupabaseServerServiceImpl};-use flowy_server_config::supabase_config::PostgresConfiguration;-use flowy_user::entities::{SignUpResponse, UpdateUserProfileParams};-use flowy_user::event_map::{UserAuthService, UserCredentials};+use flowy_user_deps::entities::*;use lib_infra::box_any::BoxAny;-use crate::setup_log;+use crate::supabase_test::util::{get_supabase_config, sign_up_param, user_auth_service};// ‼️‼️‼️ Warning: this test will create a table in the database#[tokio::test]-async fn user_sign_up_test() {- if dotenv::from_filename("./.env.test").is_err() {+async fn supabase_user_sign_up_test() {+ if get_supabase_config().is_none() {return;}- let user_service = user_auth_service_impl();- let mut params = HashMap::new();- params.insert(USER_UUID.to_string(), Uuid::new_v4().to_string());+ let user_service = user_auth_service();+ let uuid = Uuid::new_v4().to_string();+ let params = sign_up_param(uuid);let user: SignUpResponse = user_service.sign_up(BoxAny::new(params)).await.unwrap();- assert!(!user.workspace_id.is_empty());-}--fn user_auth_service_impl() -> SupabaseUserAuthServiceImpl<SupabaseServerServiceImpl> {- let server = Arc::new(PostgresServer::new(- PostgresConfiguration::from_env().unwrap(),- ));- let weak_server = SupabaseServerServiceImpl(Arc::new(RwLock::new(Some(server))));- SupabaseUserAuthServiceImpl::new(weak_server)+ assert!(!user.latest_workspace.id.is_empty());+ assert!(!user.user_workspaces.is_empty());+ assert!(!user.latest_workspace.database_storage_id.is_empty());}#[tokio::test]-async fn user_sign_up_with_existing_uuid_test() {- if dotenv::from_filename("./.env.test").is_err() {+async fn supabase_user_sign_up_with_existing_uuid_test() {+ if get_supabase_config().is_none() {return;}- let user_service = user_auth_service_impl();- let uuid = Uuid::new_v4();-- let mut params = HashMap::new();- params.insert(USER_UUID.to_string(), uuid.to_string());+ let user_service = user_auth_service();+ let uuid = Uuid::new_v4().to_string();+ let params = sign_up_param(uuid);let _user: SignUpResponse = user_service.sign_up(BoxAny::new(params.clone())).await.unwrap();let user: SignUpResponse = user_service.sign_up(BoxAny::new(params)).await.unwrap();- assert!(!user.workspace_id.is_empty());+ assert!(!user.latest_workspace.id.is_empty());+ assert!(!user.latest_workspace.database_storage_id.is_empty());+ assert!(!user.user_workspaces.is_empty());}#[tokio::test]-async fn update_user_profile_test() {- if dotenv::from_filename("./.env.test").is_err() {+async fn supabase_update_user_profile_test() {+ if get_supabase_config().is_none() {return;}- let user_service = user_auth_service_impl();- let uuid = Uuid::new_v4();-- let mut params = HashMap::new();- params.insert(USER_UUID.to_string(), uuid.to_string());+ let user_service = user_auth_service();+ let uuid = Uuid::new_v4().to_string();+ let params = sign_up_param(uuid);let user: SignUpResponse = user_service.sign_up(BoxAny::new(params.clone())).await@@ -74,7 +58,7 @@ async fn update_user_profile_test() {id: user.user_id,auth_type: Default::default(),name: Some("123".to_string()),- email: Some("[email protected]".to_string()),+ email: Some(format!("{}@test.com", Uuid::new_v4())),password: None,icon_url: None,openai_key: None,@@ -93,57 +77,33 @@ async fn update_user_profile_test() {}#[tokio::test]-async fn get_user_profile_test() {- if dotenv::from_filename("./.env.test").is_err() {+async fn supabase_get_user_profile_test() {+ if get_supabase_config().is_none() {return;}- setup_log();- let user_service = user_auth_service_impl();- let uuid = Uuid::new_v4();-- let mut params = HashMap::new();- params.insert(USER_UUID.to_string(), uuid.to_string());+ let user_service = user_auth_service();+ let uuid = Uuid::new_v4().to_string();+ let params = sign_up_param(uuid);let user: SignUpResponse = user_service.sign_up(BoxAny::new(params.clone())).await.unwrap();let credential = UserCredentials::from_uid(user.user_id);-user_service.get_user_profile(credential.clone()).await.unwrap().unwrap();- user_service- .get_user_profile(credential.clone())- .await- .unwrap()- .unwrap();- user_service- .get_user_profile(credential.clone())- .await- .unwrap()- .unwrap();- user_service- .get_user_profile(credential.clone())- .await- .unwrap()- .unwrap();- user_service- .get_user_profile(credential)- .await- .unwrap()- .unwrap();}#[tokio::test]-async fn get_not_exist_user_profile_test() {- if dotenv::from_filename("./.env.test").is_err() {+async fn supabase_get_not_exist_user_profile_test() {+ if get_supabase_config().is_none() {return;}- setup_log();- let user_service = user_auth_service_impl();++ let user_service = user_auth_service();let result = user_service.get_user_profile(UserCredentials::from_uid(i64::MAX)).awaitdiff --git a/frontend/rust-lib/flowy-server/tests/supabase_test/util.rs b/frontend/rust-lib/flowy-server/tests/supabase_test/util.rsnew file mode 100644index 0000000000..2e3ae061e4--- /dev/null+++ b/frontend/rust-lib/flowy-server/tests/supabase_test/util.rs@@ -0,0 +1,65 @@+use std::collections::HashMap;+use std::sync::Arc;++use collab_plugins::cloud_storage::RemoteCollabStorage;+use uuid::Uuid;++use flowy_database_deps::cloud::DatabaseCloudService;+use flowy_folder_deps::cloud::FolderCloudService;+use flowy_server::supabase::api::{+ RESTfulPostgresServer, RESTfulSupabaseCollabStorageImpl, RESTfulSupabaseDatabaseServiceImpl,+ RESTfulSupabaseFolderServiceImpl, RESTfulSupabaseUserAuthServiceImpl, SupabaseServerServiceImpl,+};+use flowy_server::supabase::define::{USER_EMAIL, USER_UUID};+use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_user_deps::cloud::UserService;++use crate::setup_log;++pub fn get_supabase_config() -> Option<SupabaseConfiguration> {+ dotenv::from_filename("./.env.test").ok()?;+ setup_log();+ SupabaseConfiguration::from_env().ok()+}++pub fn collab_service() -> Arc<dyn RemoteCollabStorage> {+ let config = SupabaseConfiguration::from_env().unwrap();+ let server = Arc::new(RESTfulPostgresServer::new(config));+ Arc::new(RESTfulSupabaseCollabStorageImpl::new(+ SupabaseServerServiceImpl::new(server),+ ))+}++pub fn database_service() -> Arc<dyn DatabaseCloudService> {+ let config = SupabaseConfiguration::from_env().unwrap();+ let server = Arc::new(RESTfulPostgresServer::new(config));+ Arc::new(RESTfulSupabaseDatabaseServiceImpl::new(+ SupabaseServerServiceImpl::new(server),+ ))+}++pub fn user_auth_service() -> Arc<dyn UserService> {+ let config = SupabaseConfiguration::from_env().unwrap();+ let server = Arc::new(RESTfulPostgresServer::new(config));+ Arc::new(RESTfulSupabaseUserAuthServiceImpl::new(+ SupabaseServerServiceImpl::new(server),+ ))+}++pub fn folder_service() -> Arc<dyn FolderCloudService> {+ let config = SupabaseConfiguration::from_env().unwrap();+ let server = Arc::new(RESTfulPostgresServer::new(config));+ Arc::new(RESTfulSupabaseFolderServiceImpl::new(+ SupabaseServerServiceImpl::new(server),+ ))+}++pub fn sign_up_param(uuid: String) -> HashMap<String, String> {+ let mut params = HashMap::new();+ params.insert(USER_UUID.to_string(), uuid);+ params.insert(+ USER_EMAIL.to_string(),+ format!("{}@test.com", Uuid::new_v4()),+ );+ params+}diff --git a/frontend/rust-lib/flowy-sqlite/migrations/2023-07-21-081348_user_workspace/down.sql b/frontend/rust-lib/flowy-sqlite/migrations/2023-07-21-081348_user_workspace/down.sqlnew file mode 100644index 0000000000..e52532515f--- /dev/null+++ b/frontend/rust-lib/flowy-sqlite/migrations/2023-07-21-081348_user_workspace/down.sql@@ -0,0 +1,2 @@+-- This file should undo anything in `up.sql`+DROP TABLE user_workspace;\ No newline at end of filediff --git a/frontend/rust-lib/flowy-sqlite/migrations/2023-07-21-081348_user_workspace/up.sql b/frontend/rust-lib/flowy-sqlite/migrations/2023-07-21-081348_user_workspace/up.sqlnew file mode 100644index 0000000000..7c92bbfebb--- /dev/null+++ b/frontend/rust-lib/flowy-sqlite/migrations/2023-07-21-081348_user_workspace/up.sql@@ -0,0 +1,8 @@+-- Your SQL goes here+CREATE TABLE user_workspace_table (+ id TEXT NOT NULL PRIMARY KEY,+ name TEXT NOT NULL,+ uid BIGINT NOT NULL,+ created_at BIGINT NOT NULL DEFAULT 0,+ database_storage_id TEXT NOT NULL+);diff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rsindex 6034714aa2..6e9a9e3d41 100644--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs@@ -25,4 +25,14 @@ diesel::table! {}}-diesel::allow_tables_to_appear_in_same_query!(collab_snapshot, user_table,);+diesel::table! {+ user_workspace_table (id) {+ id -> Text,+ name -> Text,+ uid -> BigInt,+ created_at -> BigInt,+ database_storage_id -> Text,+ }+}++diesel::allow_tables_to_appear_in_same_query!(collab_snapshot, user_table, user_workspace_table,);diff --git a/frontend/rust-lib/flowy-test/Cargo.toml b/frontend/rust-lib/flowy-test/Cargo.tomlindex 8a4b3d4e30..8d900679dc 100644--- a/frontend/rust-lib/flowy-test/Cargo.toml+++ b/frontend/rust-lib/flowy-test/Cargo.toml@@ -8,12 +8,12 @@ edition = "2018"[dependencies]flowy-core = { path = "../flowy-core" }flowy-user = { path = "../flowy-user"}+flowy-user-deps = { path = "../flowy-user-deps"}flowy-net = { path = "../flowy-net"}flowy-folder2 = { path = "../flowy-folder2", features = ["test_helper"] }flowy-database2 = { path = "../flowy-database2" }flowy-document2 = { path = "../flowy-document2" }lib-dispatch = { path = "../lib-dispatch" }-lib-ot = { path = "../../../shared-lib/lib-ot" }lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-server = { path = "../flowy-server" }flowy-server-config = { path = "../flowy-server-config" }@@ -28,18 +28,19 @@ futures-util = "0.3.26"thread-id = "3.3.0"bytes = "1.4"nanoid = "0.4.0"-tempdir = "0.3.7"tracing = { version = "0.1.27" }parking_lot = "0.12.1"-dotenv = "0.15.0"uuid = { version = "1.3.3", features = ["serde", "v4"] }[dev-dependencies]+dotenv = "0.15.0"+tempdir = "0.3.7"uuid = { version = "1.3.3", features = ["v4"] }collab = { version = "0.1.0" }collab-document = { version = "0.1.0" }collab-folder = { version = "0.1.0" }collab-database = { version = "0.1.0" }+collab-plugins = { version = "0.1.0" }assert-json-diff = "2.0.2"tokio-postgres = { version = "0.7.8" }diff --git a/frontend/rust-lib/flowy-test/src/lib.rs b/frontend/rust-lib/flowy-test/src/lib.rsindex 91ae74e9b6..b2f2fa2475 100644--- a/frontend/rust-lib/flowy-test/src/lib.rs+++ b/frontend/rust-lib/flowy-test/src/lib.rs@@ -19,8 +19,9 @@ use flowy_folder2::entities::*;use flowy_folder2::event_map::FolderEvent;use flowy_notification::entities::SubscribeObject;use flowy_notification::{register_notification_sender, NotificationSender};+use flowy_server::supabase::define::{USER_EMAIL, USER_UUID};use flowy_user::entities::{AuthTypePB, ThirdPartyAuthPB, UserProfilePB};-use flowy_user::errors::FlowyError;+use flowy_user::errors::{FlowyError, FlowyResult};use flowy_user::event_map::UserEvent::*;use crate::event_builder::EventBuilder;@@ -42,8 +43,10 @@ pub struct FlowyCoreTest {impl Default for FlowyCoreTest {fn default() -> Self {let temp_dir = temp_dir();- let config = AppFlowyCoreConfig::new(temp_dir.to_str().unwrap(), nanoid!(6))- .log_filter("debug", vec!["flowy_test".to_string()]);+ let config = AppFlowyCoreConfig::new(temp_dir.to_str().unwrap(), nanoid!(6)).log_filter(+ "info",+ vec!["flowy_test".to_string(), "lib_dispatch".to_string()],+ );let inner = std::thread::spawn(|| AppFlowyCore::new(config)).join()@@ -108,9 +111,17 @@ impl FlowyCoreTest {self.sign_up_as_guest().await.user_profile}- pub async fn sign_up_with_uuid(&self, uuid: &str) -> UserProfilePB {+ pub async fn third_party_sign_up_with_uuid(+ &self,+ uuid: &str,+ email: Option<String>,+ ) -> FlowyResult<UserProfilePB> {let mut map = HashMap::new();- map.insert("uuid".to_string(), uuid.to_string());+ map.insert(USER_UUID.to_string(), uuid.to_string());+ map.insert(+ USER_EMAIL.to_string(),+ email.unwrap_or_else(|| format!("{}@appflowy.io", nanoid!(10))),+ );let payload = ThirdPartyAuthPB {map,auth_type: AuthTypePB::Supabase,@@ -121,11 +132,11 @@ impl FlowyCoreTest {.payload(payload).async_send().await- .parse::<UserProfilePB>();+ .try_parse::<UserProfilePB>()?;let user_path = PathBuf::from(&self.config.storage_path).join(user_profile.id.to_string());*self.cleaner.write() = Some(Cleaner::new(user_path));- user_profile+ Ok(user_profile)}// Must sign up/ sign in first@@ -702,16 +713,18 @@ impl TestNotificationSender {Self::default()}- pub fn subscribe<T>(&self, id: &str) -> tokio::sync::mpsc::Receiver<T>+ pub fn subscribe<T>(&self, id: &str, ty: impl Into<i32> + Send) -> tokio::sync::mpsc::Receiver<T>whereT: TryFrom<Bytes, Error = ProtobufError> + Send + 'static,{let id = id.to_string();let (tx, rx) = tokio::sync::mpsc::channel::<T>(10);let mut receiver = self.sender.subscribe();+ let ty = ty.into();tokio::spawn(async move {+ // DatabaseNotification::DidUpdateDatabaseSnapshotStatewhile let Ok(value) = receiver.recv().await {- if value.id == id {+ if value.id == id && value.ty == ty {if let Some(payload) = value.payload {if let Ok(object) = T::try_from(Bytes::from(payload)) {let _ = tx.send(object).await;diff --git a/frontend/rust-lib/flowy-test/tests/database/supabase_test/helper.rs b/frontend/rust-lib/flowy-test/tests/database/supabase_test/helper.rsindex 4c96cf34dd..44876b12da 100644--- a/frontend/rust-lib/flowy-test/tests/database/supabase_test/helper.rs+++ b/frontend/rust-lib/flowy-test/tests/database/supabase_test/helper.rs@@ -5,6 +5,7 @@ use collab::core::collab::MutexCollab;use collab::core::origin::CollabOrigin;use collab::preclude::updates::decoder::Decode;use collab::preclude::{merge_updates_v1, JsonValue, Update};+use collab_plugins::cloud_storage::CollabType;use flowy_database2::entities::{DatabasePB, DatabaseViewIdPB, RepeatedDatabaseSnapshotPB};use flowy_database2::event_map::DatabaseEvent::*;@@ -22,14 +23,20 @@ impl FlowySupabaseDatabaseTest {#[allow(dead_code)]pub async fn new_with_user(uuid: String) -> Option<Self> {let inner = FlowySupabaseTest::new()?;- inner.sign_up_with_uuid(&uuid).await;+ inner+ .third_party_sign_up_with_uuid(&uuid, None)+ .await+ .unwrap();Some(Self { uuid, inner })}pub async fn new_with_new_user() -> Option<Self> {let inner = FlowySupabaseTest::new()?;let uuid = uuid::Uuid::new_v4().to_string();- let _ = inner.sign_up_with_uuid(&uuid).await;+ let _ = inner+ .third_party_sign_up_with_uuid(&uuid, None)+ .await+ .unwrap();Some(Self { uuid, inner })}@@ -69,9 +76,12 @@ impl FlowySupabaseDatabaseTest {.parse::<RepeatedDatabaseSnapshotPB>()}- pub async fn get_collab_update(&self, database_id: &str) -> Vec<u8> {+ pub async fn get_database_collab_update(&self, database_id: &str) -> Vec<u8> {let cloud_service = self.database_manager.get_cloud_service().clone();- let remote_updates = cloud_service.get_collab_update(database_id).await.unwrap();+ let remote_updates = cloud_service+ .get_collab_update(database_id, CollabType::Database)+ .await+ .unwrap();if remote_updates.is_empty() {return vec![];diff --git a/frontend/rust-lib/flowy-test/tests/database/supabase_test/test.rs b/frontend/rust-lib/flowy-test/tests/database/supabase_test/test.rsindex 0330de4be7..f5867c34f7 100644--- a/frontend/rust-lib/flowy-test/tests/database/supabase_test/test.rs+++ b/frontend/rust-lib/flowy-test/tests/database/supabase_test/test.rs@@ -3,6 +3,7 @@ use std::time::Duration;use flowy_database2::entities::{DatabaseSnapshotStatePB, DatabaseSyncStatePB, FieldChangesetPB, FieldType,};+use flowy_database2::notification::DatabaseNotification::DidUpdateDatabaseSnapshotState;use crate::database::supabase_test::helper::{assert_database_collab_content, FlowySupabaseDatabaseTest,@@ -10,12 +11,12 @@ use crate::database::supabase_test::helper::{use crate::util::receive_with_timeout;#[tokio::test]-async fn cloud_test_supabase_initial_database_snapshot_test() {+async fn supabase_initial_database_snapshot_test() {if let Some(test) = FlowySupabaseDatabaseTest::new_with_new_user().await {let (view, database) = test.create_database().await;let mut rx = test.notification_sender- .subscribe::<DatabaseSnapshotStatePB>(&database.id);+ .subscribe::<DatabaseSnapshotStatePB>(&database.id, DidUpdateDatabaseSnapshotState);receive_with_timeout(&mut rx, Duration::from_secs(30)).await@@ -29,7 +30,7 @@ async fn cloud_test_supabase_initial_database_snapshot_test() {}#[tokio::test]-async fn cloud_test_supabase_edit_database_test() {+async fn supabase_edit_database_test() {if let Some(test) = FlowySupabaseDatabaseTest::new_with_new_user().await {let (view, database) = test.create_database().await;let existing_fields = test.get_all_database_fields(&view.id).await;@@ -59,7 +60,7 @@ async fn cloud_test_supabase_edit_database_test() {assert_eq!(test.get_all_database_fields(&view.id).await.items.len(), 2);let expected = test.get_collab_json(&database.id).await;- let update = test.get_collab_update(&database.id).await;+ let update = test.get_database_collab_update(&database.id).await;assert_database_collab_content(&database.id, &update, expected);}}diff --git a/frontend/rust-lib/flowy-test/tests/document/supabase_test/helper.rs b/frontend/rust-lib/flowy-test/tests/document/supabase_test/helper.rsindex fc00f2e89f..0a6e063a31 100644--- a/frontend/rust-lib/flowy-test/tests/document/supabase_test/helper.rs+++ b/frontend/rust-lib/flowy-test/tests/document/supabase_test/helper.rs@@ -1,4 +1,5 @@-use crate::util::FlowySupabaseTest;+use std::ops::Deref;+use std::sync::Arc;use collab::core::collab::MutexCollab;use collab::core::origin::CollabOrigin;@@ -6,14 +7,15 @@ use collab::preclude::updates::decoder::Decode;use collab::preclude::{merge_updates_v1, Update};use collab_document::blocks::DocumentData;use collab_document::document::Document;+use flowy_document2::entities::{DocumentDataPB, OpenDocumentPayloadPB, RepeatedDocumentSnapshotPB,};use flowy_document2::event_map::DocumentEvent::{GetDocumentData, GetDocumentSnapshots};use flowy_folder2::entities::ViewPB;use flowy_test::event_builder::EventBuilder;-use std::ops::Deref;-use std::sync::Arc;++use crate::util::FlowySupabaseTest;pub struct FlowySupabaseDocumentTest {inner: FlowySupabaseTest,@@ -23,7 +25,7 @@ impl FlowySupabaseDocumentTest {pub async fn new() -> Option<Self> {let inner = FlowySupabaseTest::new()?;let uuid = uuid::Uuid::new_v4().to_string();- let _ = inner.sign_up_with_uuid(&uuid).await;+ let _ = inner.third_party_sign_up_with_uuid(&uuid, None).await;Some(Self { inner })}@@ -60,7 +62,7 @@ impl FlowySupabaseDocumentTest {}pub async fn get_collab_update(&self, document_id: &str) -> Vec<u8> {- let cloud_service = self.document_manager2.get_cloud_service().clone();+ let cloud_service = self.document_manager.get_cloud_service().clone();let remote_updates = cloud_service.get_document_updates(document_id).awaitdiff --git a/frontend/rust-lib/flowy-test/tests/document/supabase_test/test.rs b/frontend/rust-lib/flowy-test/tests/document/supabase_test/test.rsindex 6572e34119..5fdb689e98 100644--- a/frontend/rust-lib/flowy-test/tests/document/supabase_test/test.rs+++ b/frontend/rust-lib/flowy-test/tests/document/supabase_test/test.rs@@ -2,6 +2,7 @@ use std::ops::Deref;use std::time::Duration;use flowy_document2::entities::{DocumentSnapshotStatePB, DocumentSyncStatePB};+use flowy_document2::notification::DocumentNotification::DidUpdateDocumentSnapshotState;use flowy_test::document::document_event::DocumentEventTest;use crate::document::supabase_test::helper::{@@ -10,13 +11,13 @@ use crate::document::supabase_test::helper::{use crate::util::receive_with_timeout;#[tokio::test]-async fn cloud_test_supabase_initial_document_snapshot_test() {+async fn supabase_initial_document_snapshot_test() {if let Some(test) = FlowySupabaseDocumentTest::new().await {let view = test.create_document().await;let mut rx = test.notification_sender- .subscribe::<DocumentSnapshotStatePB>(&view.id);+ .subscribe::<DocumentSnapshotStatePB>(&view.id, DidUpdateDocumentSnapshotState);receive_with_timeout(&mut rx, Duration::from_secs(30)).await@@ -31,7 +32,7 @@ async fn cloud_test_supabase_initial_document_snapshot_test() {}#[tokio::test]-async fn cloud_test_supabase_document_edit_sync_test() {+async fn supabase_document_edit_sync_test() {if let Some(test) = FlowySupabaseDocumentTest::new().await {let view = test.create_document().await;let document_id = view.id.clone();@@ -57,7 +58,7 @@ async fn cloud_test_supabase_document_edit_sync_test() {}#[tokio::test]-async fn cloud_test_supabase_document_edit_sync_test2() {+async fn supabase_document_edit_sync_test2() {if let Some(test) = FlowySupabaseDocumentTest::new().await {let view = test.create_document().await;let document_id = view.id.clone();diff --git a/frontend/rust-lib/flowy-test/tests/folder/supabase_test/helper.rs b/frontend/rust-lib/flowy-test/tests/folder/supabase_test/helper.rsindex b1522f407c..8f726e50ee 100644--- a/frontend/rust-lib/flowy-test/tests/folder/supabase_test/helper.rs+++ b/frontend/rust-lib/flowy-test/tests/folder/supabase_test/helper.rs@@ -20,7 +20,7 @@ impl FlowySupabaseFolderTest {pub async fn new() -> Option<Self> {let inner = FlowySupabaseTest::new()?;let uuid = uuid::Uuid::new_v4().to_string();- let _ = inner.sign_up_with_uuid(&uuid).await;+ let _ = inner.third_party_sign_up_with_uuid(&uuid, None).await;Some(Self { inner })}diff --git a/frontend/rust-lib/flowy-test/tests/folder/supabase_test/test.rs b/frontend/rust-lib/flowy-test/tests/folder/supabase_test/test.rsindex 54ac8ca34e..9de6570525 100644--- a/frontend/rust-lib/flowy-test/tests/folder/supabase_test/test.rs+++ b/frontend/rust-lib/flowy-test/tests/folder/supabase_test/test.rs@@ -1,17 +1,18 @@use std::time::Duration;use flowy_folder2::entities::{FolderSnapshotStatePB, FolderSyncStatePB};+use flowy_folder2::notification::FolderNotification::DidUpdateFolderSnapshotState;use crate::folder::supabase_test::helper::{assert_folder_collab_content, FlowySupabaseFolderTest};use crate::util::receive_with_timeout;#[tokio::test]-async fn cloud_test_supabase_initial_folder_snapshot_test() {+async fn supabase_initial_folder_snapshot_test() {if let Some(test) = FlowySupabaseFolderTest::new().await {let workspace_id = test.get_current_workspace().await.workspace.id;let mut rx = test.notification_sender- .subscribe::<FolderSnapshotStatePB>(&workspace_id);+ .subscribe::<FolderSnapshotStatePB>(&workspace_id, DidUpdateFolderSnapshotState);receive_with_timeout(&mut rx, Duration::from_secs(30)).await@@ -25,7 +26,7 @@ async fn cloud_test_supabase_initial_folder_snapshot_test() {}#[tokio::test]-async fn cloud_test_supabase_initial_folder_snapshot_test2() {+async fn supabase_initial_folder_snapshot_test2() {if let Some(test) = FlowySupabaseFolderTest::new().await {let workspace_id = test.get_current_workspace().await.workspace.id;diff --git a/frontend/rust-lib/flowy-test/tests/main.rs b/frontend/rust-lib/flowy-test/tests/main.rsindex e0e50b0932..91d1d2a44f 100644--- a/frontend/rust-lib/flowy-test/tests/main.rs+++ b/frontend/rust-lib/flowy-test/tests/main.rs@@ -3,5 +3,3 @@ mod document;mod folder;mod user;pub mod util;--mod tool;diff --git a/frontend/rust-lib/flowy-test/tests/tool/mod.rs b/frontend/rust-lib/flowy-test/tests/tool/mod.rsdeleted file mode 100644index 4478fbe55e..0000000000--- a/frontend/rust-lib/flowy-test/tests/tool/mod.rs+++ /dev/null@@ -1,2 +0,0 @@-mod pg_migration;-// mod pg_row;diff --git a/frontend/rust-lib/flowy-test/tests/tool/pg_migration.rs b/frontend/rust-lib/flowy-test/tests/tool/pg_migration.rsdeleted file mode 100644index f7ba3464a1..0000000000--- a/frontend/rust-lib/flowy-test/tests/tool/pg_migration.rs+++ /dev/null@@ -1,74 +0,0 @@-use tokio_postgres::{Client, NoTls};--use flowy_server_config::supabase_config::PostgresConfiguration;--/// Drop all tables and dependencies defined in the v1_initial_up.sql.-/// Be careful when using this function. It will drop all tables and dependencies.-/// Mostly used for testing.-#[allow(dead_code)]-#[cfg(debug_assertions)]-pub(crate) async fn run_initial_drop(client: &Client) {- // let sql = include_str!("migrations/initial/initial_down.sql");- let sql = r#"DROP TABLE IF EXISTS af_user;-DROP TABLE IF EXISTS af_workspace;-DROP TABLE IF EXISTS af_user_profile;-DROP TABLE IF EXISTS af_collab;-DROP VIEW IF EXISTS af_collab_state;-DROP TABLE IF EXISTS af_collab_snapshot;-DROP TABLE IF EXISTS af_collab_statistics;--DROP TRIGGER IF EXISTS create_af_user_profile_trigger ON af_user_profile CASCADE;-DROP FUNCTION IF EXISTS create_af_user_profile_trigger_func;--DROP TRIGGER IF EXISTS create_af_workspace_trigger ON af_workspace CASCADE;-DROP FUNCTION IF EXISTS create_af_workspace_trigger_func;--DROP TRIGGER IF EXISTS af_collab_insert_trigger ON af_collab CASCADE;-DROP FUNCTION IF EXISTS increment_af_collab_update_count;--DROP TRIGGER IF EXISTS af_collab_snapshot_update_edit_count_trigger ON af_collab_snapshot;-DROP FUNCTION IF EXISTS af_collab_snapshot_update_edit_count;--DROP TRIGGER IF EXISTS check_and_delete_snapshots_trigger ON af_collab_snapshot CASCADE;-DROP FUNCTION IF EXISTS check_and_delete_snapshots;--DROP TRIGGER IF EXISTS new_af_collab_row_trigger ON af_collab CASCADE;-DROP FUNCTION IF EXISTS notify_on_insert_af_collab;-"#;- client.batch_execute(sql).await.unwrap();- client- .batch_execute("DROP TABLE IF EXISTS af_migration_history")- .await- .unwrap();-}--// ‼️‼️‼️ Warning: this test will create a table in the database-#[tokio::test]-async fn run_initial_drop_test() -> Result<(), anyhow::Error> {- // rename the `.evn.test.danger` to the actual env file name.- if dotenv::from_filename(".env.test.danger").is_err() {- return Ok(());- }-- let configuration = PostgresConfiguration::from_env().unwrap();- let mut config = tokio_postgres::Config::new();- config- .host(&configuration.url)- .user(&configuration.user_name)- .password(&configuration.password)- .port(configuration.port);-- // Using the https://docs.rs/postgres-openssl/latest/postgres_openssl/ to enable tls connection.- let (client, connection) = config.connect(NoTls).await?;- tokio::spawn(async move {- if let Err(e) = connection.await {- tracing::error!("postgres db connection error: {}", e);- }- });-- #[cfg(debug_assertions)]- {- run_initial_drop(&client).await;- }- Ok(())-}diff --git a/frontend/rust-lib/flowy-test/tests/tool/pg_row.rs b/frontend/rust-lib/flowy-test/tests/tool/pg_row.rsdeleted file mode 100644index 1b3e7e57d0..0000000000--- a/frontend/rust-lib/flowy-test/tests/tool/pg_row.rs+++ /dev/null@@ -1,172 +0,0 @@-use std::sync::Arc;--use assert_json_diff::assert_json_eq;-use collab::core::collab::MutexCollab;-use collab::core::origin::CollabOrigin;-use collab::preclude::updates::decoder::Decode;-use collab::preclude::Update;-use parking_lot::RwLock;-use serde_json::json;--use flowy_database2::deps::DatabaseCloudService;-use flowy_document2::deps::DocumentCloudService;-use flowy_folder2::deps::{FolderCloudService, FolderSnapshot};-use flowy_server::supabase::impls::{- SupabaseDatabaseCloudServiceImpl, SupabaseDocumentCloudServiceImpl,- SupabaseFolderCloudServiceImpl,-};-use flowy_server::supabase::{PostgresServer, SupabaseServerServiceImpl};--use crate::util::get_supabase_config;--pub struct PostgresConnect {- inner: Arc<PostgresServer>,-}--impl PostgresConnect {- pub fn new() -> Option<Self> {- let config = get_supabase_config()?;- let inner = PostgresServer::new(config.postgres_config);- Some(Self {- inner: Arc::new(inner),- })- }-- fn server_provider_impl(&self) -> SupabaseServerServiceImpl {- SupabaseServerServiceImpl(Arc::new(RwLock::new(Some(self.inner.clone()))))- }-- async fn get_folder(&self, workspace_id: &str) -> MutexCollab {- let folder_service = SupabaseFolderCloudServiceImpl::new(self.server_provider_impl());- let updates = folder_service- .get_folder_updates(workspace_id, 0)- .await- .unwrap();- let collab = MutexCollab::new(CollabOrigin::Server, workspace_id, vec![]);- collab.lock().with_transact_mut(|txn| {- for update in updates {- txn.apply_update(Update::decode_v1(&update).unwrap());- }- });- collab- }-- async fn get_folder_snapshot(&self, workspace_id: &str) -> MutexCollab {- let folder_service = SupabaseFolderCloudServiceImpl::new(self.server_provider_impl());- let snapshot: FolderSnapshot = folder_service- .get_folder_latest_snapshot(workspace_id)- .await- .unwrap()- .unwrap();- let collab = MutexCollab::new(CollabOrigin::Server, workspace_id, vec![]);- collab.lock().with_transact_mut(|txn| {- txn.apply_update(Update::decode_v1(&snapshot.data).unwrap());- });- collab- }-- async fn get_database_collab_object(&self, object_id: &str) -> MutexCollab {- let database_service = SupabaseDatabaseCloudServiceImpl::new(self.server_provider_impl());- let updates = database_service.get_collab_update(object_id).await.unwrap();- let collab = MutexCollab::new(CollabOrigin::Server, object_id, vec![]);- collab.lock().with_transact_mut(|txn| {- for update in updates {- txn.apply_update(Update::decode_v1(&update).unwrap());- }- });- collab- }-- async fn get_database_rows_object(&self, row_ids: Vec<String>) -> Vec<MutexCollab> {- let database_service = SupabaseDatabaseCloudServiceImpl::new(self.server_provider_impl());- let updates_by_oid = database_service- .batch_get_collab_updates(row_ids)- .await- .unwrap();- let mut collabs = vec![];- for (oid, updates) in updates_by_oid {- let collab = MutexCollab::new(CollabOrigin::Server, &oid, vec![]);- collab.lock().with_transact_mut(|txn| {- for update in updates {- txn.apply_update(Update::decode_v1(&update).unwrap());- }- });- collabs.push(collab);- }- collabs- }-- async fn get_document(&self, document_id: &str) -> MutexCollab {- let document_service = SupabaseDocumentCloudServiceImpl::new(self.server_provider_impl());- let updates = document_service- .get_document_updates(document_id)- .await- .unwrap();- let collab = MutexCollab::new(CollabOrigin::Server, document_id, vec![]);- collab.lock().with_transact_mut(|txn| {- for update in updates {- txn.apply_update(Update::decode_v1(&update).unwrap());- }- });- collab- }-}--#[tokio::test]-async fn get_folder_test() {- if let Some(conn) = PostgresConnect::new() {- let collab = conn- .get_folder("2ddf790f-18bb-4e9c-aacb-f29ca755f72a")- .await;- let value = collab.to_json_value();- assert_json_eq!(value, json!(""));- }-}--#[tokio::test]-async fn get_folder_snapshot() {- if let Some(conn) = PostgresConnect::new() {- let collab = conn- .get_folder_snapshot("17f5e820-dcc8-4ca9-ab93-b45f17ca0948")- .await;- let value = collab.to_json_value();- assert_json_eq!(value, json!(""));- }-}--#[tokio::test]-async fn get_document_test() {- if let Some(conn) = PostgresConnect::new() {- let collab = conn- .get_document("158c8275-ff6d-49e1-a2ed-82c71dea1126")- .await;- let value = collab.to_json_value();- assert_json_eq!(value, json!(""));- }-}--#[tokio::test]-async fn get_workspace_database_test() {- if let Some(conn) = PostgresConnect::new() {- let collab = conn- .get_database_collab_object("MTp1c2VyOmRhdGFiYXNl")- .await;- let value = collab.to_json_value();- assert_json_eq!(value, json!(""));- }-}--#[tokio::test]-async fn batch_get_database_rows_test() {- if let Some(conn) = PostgresConnect::new() {- let row_ids = vec![- "93cebb2d-4831-496c-adde-1a82bd745099".to_string(),- "7989a12f-23b2-48ff-8d5f-9bdf651ad7aa".to_string(),- ];- let collabs = conn.get_database_rows_object(row_ids).await;- for collab in collabs {- let value = collab.to_json_value();- println!("{}", value);- }- }-}diff --git a/frontend/rust-lib/flowy-test/tests/user/supabase_test/auth_test.rs b/frontend/rust-lib/flowy-test/tests/user/supabase_test/auth_test.rsindex f8ff710713..9629cca791 100644--- a/frontend/rust-lib/flowy-test/tests/user/supabase_test/auth_test.rs+++ b/frontend/rust-lib/flowy-test/tests/user/supabase_test/auth_test.rs@@ -1,5 +1,8 @@use std::collections::HashMap;+use nanoid::nanoid;++use flowy_server::supabase::define::{USER_EMAIL, USER_UUID};use flowy_test::event_builder::EventBuilder;use flowy_test::FlowyCoreTest;use flowy_user::entities::{@@ -15,7 +18,11 @@ async fn third_party_sign_up_test() {if get_supabase_config().is_some() {let test = FlowyCoreTest::new();let mut map = HashMap::new();- map.insert("uuid".to_string(), uuid::Uuid::new_v4().to_string());+ map.insert(USER_UUID.to_string(), uuid::Uuid::new_v4().to_string());+ map.insert(+ USER_EMAIL.to_string(),+ format!("{}@appflowy.io", nanoid!(6)),+ );let payload = ThirdPartyAuthPB {map,auth_type: AuthTypePB::Supabase,@@ -31,6 +38,57 @@ async fn third_party_sign_up_test() {}}+#[tokio::test]+async fn third_party_sign_up_with_duplicated_uuid() {+ if get_supabase_config().is_some() {+ let test = FlowyCoreTest::new();+ let email = format!("{}@appflowy.io", nanoid!(6));+ let mut map = HashMap::new();+ map.insert(USER_UUID.to_string(), uuid::Uuid::new_v4().to_string());+ map.insert(USER_EMAIL.to_string(), email.clone());++ let response_1 = EventBuilder::new(test.clone())+ .event(ThirdPartyAuth)+ .payload(ThirdPartyAuthPB {+ map: map.clone(),+ auth_type: AuthTypePB::Supabase,+ })+ .async_send()+ .await+ .parse::<UserProfilePB>();+ dbg!(&response_1);++ let response_2 = EventBuilder::new(test.clone())+ .event(ThirdPartyAuth)+ .payload(ThirdPartyAuthPB {+ map: map.clone(),+ auth_type: AuthTypePB::Supabase,+ })+ .async_send()+ .await+ .parse::<UserProfilePB>();+ assert_eq!(response_1, response_2);+ };+}++#[tokio::test]+async fn third_party_sign_up_with_duplicated_email() {+ if get_supabase_config().is_some() {+ let test = FlowyCoreTest::new();+ let email = format!("{}@appflowy.io", nanoid!(6));+ test+ .third_party_sign_up_with_uuid(&uuid::Uuid::new_v4().to_string(), Some(email.clone()))+ .await+ .unwrap();+ let error = test+ .third_party_sign_up_with_uuid(&uuid::Uuid::new_v4().to_string(), Some(email.clone()))+ .await+ .err()+ .unwrap();+ assert_eq!(error.code, ErrorCode::Conflict.value());+ };+}+#[tokio::test]async fn sign_up_as_guest_and_then_update_to_new_cloud_user_test() {if get_supabase_config().is_some() {@@ -43,7 +101,10 @@ async fn sign_up_as_guest_and_then_update_to_new_cloud_user_test() {let old_workspace = test.folder_manager.get_current_workspace().await.unwrap();let uuid = uuid::Uuid::new_v4().to_string();- test.supabase_party_sign_up(&uuid).await;+ test+ .third_party_sign_up_with_uuid(&uuid, None)+ .await+ .unwrap();let new_views = test.folder_manager.get_current_workspace_views()@@ -67,14 +128,14 @@ async fn sign_up_as_guest_and_then_update_to_new_cloud_user_test() {async fn sign_up_as_guest_and_then_update_to_existing_cloud_user_test() {if get_supabase_config().is_some() {let test = FlowyCoreTest::new_with_guest_user().await;- let historical_users = test.user_session.sign_in_history();- assert_eq!(historical_users.len(), 1);let uuid = uuid::Uuid::new_v4().to_string();+ let email = format!("{}@appflowy.io", nanoid!(6));// The workspace of the guest will be migrated to the new user with given uuid- let user_profile = test.supabase_party_sign_up(&uuid).await;- // let historical_users = test.user_session.sign_in_history(user_profile.id);- // assert_eq!(historical_users.len(), 2);+ let _user_profile = test+ .third_party_sign_up_with_uuid(&uuid, Some(email.clone()))+ .await+ .unwrap();let old_cloud_workspace = test.folder_manager.get_current_workspace().await.unwrap();let old_cloud_views = test.folder_manager@@ -86,23 +147,8 @@ async fn sign_up_as_guest_and_then_update_to_existing_cloud_user_test() {// sign out and then sign in as a guesttest.sign_out().await;- // when sign out, the user profile will be not found- let error = test- .user_session- .get_user_profile(user_profile.id, false)- .await- .err()- .unwrap();- assert_eq!(error.code, ErrorCode::RecordNotFound.value());let _sign_up_context = test.sign_up_as_guest().await;- // assert_eq!(- // test- // .user_session- // .sign_in_history(sign_up_context.user_profile.id)- // .len(),- // 3- // );let new_workspace = test.folder_manager.get_current_workspace().await.unwrap();test.create_view(&new_workspace.id, "new workspace child view".to_string())@@ -112,8 +158,10 @@ async fn sign_up_as_guest_and_then_update_to_existing_cloud_user_test() {// upload to cloud user with given uuid. This time the workspace of the guest will not be merged// because the cloud user already has a workspace- test.supabase_party_sign_up(&uuid).await;- // assert_eq!(test.user_session.sign_in_history().len(), 3);+ test+ .third_party_sign_up_with_uuid(&uuid, Some(email))+ .await+ .unwrap();let new_cloud_workspace = test.folder_manager.get_current_workspace().await.unwrap();let new_cloud_views = test.folder_manager@@ -132,7 +180,7 @@ async fn check_not_exist_user_test() {.check_user_with_uuid(&uuid::Uuid::new_v4().to_string()).await.unwrap_err();- assert_eq!(err.code, ErrorCode::UserNotExist.value());+ assert_eq!(err.code, ErrorCode::RecordNotFound.value());}}@@ -140,7 +188,10 @@ async fn check_not_exist_user_test() {async fn get_user_profile_test() {if let Some(test) = FlowySupabaseTest::new() {let uuid = uuid::Uuid::new_v4().to_string();- test.sign_up_with_uuid(&uuid).await;+ test+ .third_party_sign_up_with_uuid(&uuid, None)+ .await+ .unwrap();let result = test.get_user_profile().await;assert!(result.is_ok());@@ -151,7 +202,10 @@ async fn get_user_profile_test() {async fn update_user_profile_test() {if let Some(test) = FlowySupabaseTest::new() {let uuid = uuid::Uuid::new_v4().to_string();- let profile = test.sign_up_with_uuid(&uuid).await;+ let profile = test+ .third_party_sign_up_with_uuid(&uuid, None)+ .await+ .unwrap();test.update_user_profile(UpdateUserProfilePayloadPB::new(profile.id).name("lucas")).await;@@ -160,3 +214,30 @@ async fn update_user_profile_test() {assert_eq!(new_profile.name, "lucas")}}++#[tokio::test]+async fn update_user_profile_with_existing_email_test() {+ if let Some(test) = FlowySupabaseTest::new() {+ let email = format!("{}@appflowy.io", nanoid!(6));+ let _ = test+ .third_party_sign_up_with_uuid(&uuid::Uuid::new_v4().to_string(), Some(email.clone()))+ .await;++ let profile = test+ .third_party_sign_up_with_uuid(+ &uuid::Uuid::new_v4().to_string(),+ Some(format!("{}@appflowy.io", nanoid!(6))),+ )+ .await+ .unwrap();+ let error = test+ .update_user_profile(+ UpdateUserProfilePayloadPB::new(profile.id)+ .name("lucas")+ .email(&email),+ )+ .await+ .unwrap();+ assert_eq!(error.code, ErrorCode::Conflict.value());+ }+}diff --git a/frontend/rust-lib/flowy-test/tests/user/supabase_test/workspace_test.rs b/frontend/rust-lib/flowy-test/tests/user/supabase_test/workspace_test.rsindex 17b4663e9b..1e3f9293a8 100644--- a/frontend/rust-lib/flowy-test/tests/user/supabase_test/workspace_test.rs+++ b/frontend/rust-lib/flowy-test/tests/user/supabase_test/workspace_test.rs@@ -2,6 +2,7 @@ use std::collections::HashMap;use flowy_folder2::entities::WorkspaceSettingPB;use flowy_folder2::event_map::FolderEvent::GetCurrentWorkspace;+use flowy_server::supabase::define::{USER_EMAIL, USER_UUID};use flowy_test::{event_builder::EventBuilder, FlowyCoreTest};use flowy_user::entities::{AuthTypePB, ThirdPartyAuthPB, UserProfilePB};use flowy_user::event_map::UserEvent::*;@@ -13,7 +14,11 @@ async fn initial_workspace_test() {if get_supabase_config().is_some() {let test = FlowyCoreTest::new();let mut map = HashMap::new();- map.insert("uuid".to_string(), uuid::Uuid::new_v4().to_string());+ map.insert(USER_UUID.to_string(), uuid::Uuid::new_v4().to_string());+ map.insert(+ USER_EMAIL.to_string(),+ format!("{}@gmail.com", uuid::Uuid::new_v4()),+ );let payload = ThirdPartyAuthPB {map,auth_type: AuthTypePB::Supabase,diff --git a/frontend/rust-lib/flowy-test/tests/util.rs b/frontend/rust-lib/flowy-test/tests/util.rsindex 675d008c65..c3bcd33675 100644--- a/frontend/rust-lib/flowy-test/tests/util.rs+++ b/frontend/rust-lib/flowy-test/tests/util.rs@@ -13,29 +13,8 @@ use flowy_user::entities::{use flowy_user::errors::FlowyError;use flowy_user::event_map::UserCloudServiceProvider;use flowy_user::event_map::UserEvent::*;-use flowy_user::services::AuthType;+use flowy_user_deps::entities::AuthType;-/// In order to run this test, you need to create a .env.test file in the root directory of this project-/// and add the following environment variables:-/// - SUPABASE_URL-/// - SUPABASE_ANON_KEY-/// - SUPABASE_KEY-/// - SUPABASE_JWT_SECRET-/// - SUPABASE_DB-/// - SUPABASE_DB_USER-/// - SUPABASE_DB_PORT-/// - SUPABASE_DB_PASSWORD-///-/// the .env.test file should look like this:-/// SUPABASE_URL=https://<your-supabase-url>.supabase.co-/// SUPABASE_ANON_KEY=<your-supabase-anon-key>-/// SUPABASE_KEY=<your-supabase-key>-/// SUPABASE_JWT_SECRET=<your-supabase-jwt-secret>-/// SUPABASE_DB=db.xxx.supabase.co-/// SUPABASE_DB_USER=<your-supabase-db-user>-/// SUPABASE_DB_PORT=<your-supabase-db-port>-/// SUPABASE_DB_PASSWORD=<your-supabase-db-password>-///pub fn get_supabase_config() -> Option<SupabaseConfiguration> {dotenv::from_path(".env.test").ok()?;SupabaseConfiguration::from_env().ok()@@ -76,12 +55,16 @@ impl FlowySupabaseTest {.try_parse::<UserProfilePB>()}- pub async fn update_user_profile(&self, payload: UpdateUserProfilePayloadPB) {+ pub async fn update_user_profile(+ &self,+ payload: UpdateUserProfilePayloadPB,+ ) -> Option<FlowyError> {EventBuilder::new(self.inner.clone()).event(UpdateUserProfile).payload(payload).async_send()- .await;+ .await+ .error()}}diff --git a/frontend/rust-lib/flowy-user-deps/Cargo.toml b/frontend/rust-lib/flowy-user-deps/Cargo.tomlnew file mode 100644index 0000000000..3b6ed4f78f--- /dev/null+++ b/frontend/rust-lib/flowy-user-deps/Cargo.toml@@ -0,0 +1,16 @@+[package]+name = "flowy-user-deps"+version = "0.1.0"+edition = "2021"++# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html++[dependencies]+lib-infra = { path = "../../../shared-lib/lib-infra" }+flowy-error = { path = "../flowy-error" }+uuid = { version = "1.3.3", features = ["v4"] }+serde = { version = "1.0", features = ["derive"] }+serde_json = {version = "1.0"}+serde_repr = "0.1"+chrono = { version = "0.4.22", default-features = false, features = ["clock"] }+anyhow = "1.0.71"diff --git a/frontend/rust-lib/flowy-user-deps/src/cloud.rs b/frontend/rust-lib/flowy-user-deps/src/cloud.rsnew file mode 100644index 0000000000..e479b8c8f4--- /dev/null+++ b/frontend/rust-lib/flowy-user-deps/src/cloud.rs@@ -0,0 +1,77 @@+use anyhow::Error;+use std::collections::HashMap;+use std::str::FromStr;++use uuid::Uuid;++use flowy_error::{ErrorCode, FlowyError};+use lib_infra::box_any::BoxAny;+use lib_infra::future::FutureResult;++use crate::entities::{+ SignInResponse, SignUpResponse, ThirdPartyParams, UpdateUserProfileParams, UserCredentials,+ UserProfile, UserWorkspace,+};++/// Provide the generic interface for the user cloud service+/// The user cloud service is responsible for the user authentication and user profile management+pub trait UserService: Send + Sync {+ /// Sign up a new account.+ /// The type of the params is defined the this trait's implementation.+ /// Use the `unbox_or_error` of the [BoxAny] to get the params.+ fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, Error>;++ /// Sign in an account+ /// The type of the params is defined the this trait's implementation.+ fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, Error>;++ /// Sign out an account+ fn sign_out(&self, token: Option<String>) -> FutureResult<(), Error>;++ /// Using the user's token to update the user information+ fn update_user(+ &self,+ credential: UserCredentials,+ params: UpdateUserProfileParams,+ ) -> FutureResult<(), Error>;++ /// Get the user information using the user's token or uid+ /// return None if the user is not found+ fn get_user_profile(+ &self,+ credential: UserCredentials,+ ) -> FutureResult<Option<UserProfile>, Error>;++ /// Return the all the workspaces of the user+ fn get_user_workspaces(&self, uid: i64) -> FutureResult<Vec<UserWorkspace>, Error>;++ fn check_user(&self, credential: UserCredentials) -> FutureResult<(), Error>;++ fn add_workspace_member(+ &self,+ user_email: String,+ workspace_id: String,+ ) -> FutureResult<(), Error>;++ fn remove_workspace_member(+ &self,+ user_email: String,+ workspace_id: String,+ ) -> FutureResult<(), Error>;+}++pub fn third_party_params_from_box_any(any: BoxAny) -> Result<ThirdPartyParams, Error> {+ let map: HashMap<String, String> = any.unbox_or_error()?;+ let uuid = uuid_from_map(&map)?;+ let email = map.get("email").cloned().unwrap_or_default();+ Ok(ThirdPartyParams { uuid, email })+}++pub fn uuid_from_map(map: &HashMap<String, String>) -> Result<Uuid, Error> {+ let uuid = map+ .get("uuid")+ .ok_or_else(|| FlowyError::new(ErrorCode::MissingAuthField, "Missing uuid field"))?+ .as_str();+ let uuid = Uuid::from_str(uuid)?;+ Ok(uuid)+}diff --git a/frontend/rust-lib/flowy-user-deps/src/entities.rs b/frontend/rust-lib/flowy-user-deps/src/entities.rsnew file mode 100644index 0000000000..edbda22811--- /dev/null+++ b/frontend/rust-lib/flowy-user-deps/src/entities.rs@@ -0,0 +1,192 @@+use chrono::{DateTime, Utc};+use serde::{Deserialize, Serialize};+use serde_repr::*;+use uuid::Uuid;++#[derive(Debug, Serialize, Deserialize, Clone)]+pub struct SignInResponse {+ pub user_id: i64,+ pub name: String,+ pub latest_workspace: UserWorkspace,+ pub user_workspaces: Vec<UserWorkspace>,+ pub email: Option<String>,+ pub token: Option<String>,+}++#[derive(Default, Serialize, Deserialize, Debug)]+pub struct SignInParams {+ pub email: String,+ pub password: String,+ pub name: String,+ pub auth_type: AuthType,+ // Currently, the uid only used in local sign in.+ pub uid: Option<i64>,+}++#[derive(Serialize, Deserialize, Default, Debug)]+pub struct SignUpParams {+ pub email: String,+ pub name: String,+ pub password: String,+ pub auth_type: AuthType,+}++#[derive(Serialize, Deserialize, Debug, Clone)]+pub struct SignUpResponse {+ pub user_id: i64,+ pub name: String,+ pub latest_workspace: UserWorkspace,+ pub user_workspaces: Vec<UserWorkspace>,+ pub is_new: bool,+ pub email: Option<String>,+ pub token: Option<String>,+}++#[derive(Clone, Debug)]+pub struct UserCredentials {+ /// Currently, the token is only used when the [AuthType] is SelfHosted+ pub token: Option<String>,++ /// The user id+ pub uid: Option<i64>,++ /// The user id+ pub uuid: Option<String>,+}++impl UserCredentials {+ pub fn from_uid(uid: i64) -> Self {+ Self {+ token: None,+ uid: Some(uid),+ uuid: None,+ }+ }++ pub fn from_uuid(uuid: String) -> Self {+ Self {+ token: None,+ uid: None,+ uuid: Some(uuid),+ }+ }++ pub fn new(token: Option<String>, uid: Option<i64>, uuid: Option<String>) -> Self {+ Self { token, uid, uuid }+ }+}++#[derive(Debug, Serialize, Deserialize, Clone)]+pub struct UserWorkspace {+ pub id: String,+ pub name: String,+ pub created_at: DateTime<Utc>,+ pub database_storage_id: String,+}++impl UserWorkspace {+ pub fn new(workspace_id: &str, _uid: i64) -> Self {+ Self {+ id: workspace_id.to_string(),+ name: "".to_string(),+ created_at: Utc::now(),+ database_storage_id: uuid::Uuid::new_v4().to_string(),+ }+ }+}++#[derive(Serialize, Deserialize, Default, Debug, Clone)]+pub struct UserProfile {+ pub id: i64,+ pub email: String,+ pub name: String,+ pub token: String,+ pub icon_url: String,+ pub openai_key: String,+ pub workspace_id: String,+ pub auth_type: AuthType,+}++#[derive(Serialize, Deserialize, Default, Clone, Debug)]+pub struct UpdateUserProfileParams {+ pub id: i64,+ pub auth_type: AuthType,+ pub name: Option<String>,+ pub email: Option<String>,+ pub password: Option<String>,+ pub icon_url: Option<String>,+ pub openai_key: Option<String>,+}++impl UpdateUserProfileParams {+ pub fn name(mut self, name: &str) -> Self {+ self.name = Some(name.to_owned());+ self+ }++ pub fn email(mut self, email: &str) -> Self {+ self.email = Some(email.to_owned());+ self+ }++ pub fn password(mut self, password: &str) -> Self {+ self.password = Some(password.to_owned());+ self+ }++ pub fn icon_url(mut self, icon_url: &str) -> Self {+ self.icon_url = Some(icon_url.to_owned());+ self+ }++ pub fn openai_key(mut self, openai_key: &str) -> Self {+ self.openai_key = Some(openai_key.to_owned());+ self+ }++ pub fn is_empty(&self) -> bool {+ self.name.is_none()+ && self.email.is_none()+ && self.password.is_none()+ && self.icon_url.is_none()+ && self.openai_key.is_none()+ }+}++#[derive(Debug, Clone, Hash, Serialize_repr, Deserialize_repr, Eq, PartialEq)]+#[repr(u8)]+pub enum AuthType {+ /// It's a local server, we do fake sign in default.+ Local = 0,+ /// Currently not supported. It will be supported in the future when the+ /// [AppFlowy-Server](https://github.com/AppFlowy-IO/AppFlowy-Server) ready.+ SelfHosted = 1,+ /// It uses Supabase as the backend.+ Supabase = 2,+}+impl Default for AuthType {+ fn default() -> Self {+ Self::Local+ }+}++impl AuthType {+ pub fn is_local(&self) -> bool {+ matches!(self, AuthType::Local)+ }+}++impl From<i32> for AuthType {+ fn from(value: i32) -> Self {+ match value {+ 0 => AuthType::Local,+ 1 => AuthType::SelfHosted,+ 2 => AuthType::Supabase,+ _ => AuthType::Local,+ }+ }+}+pub struct ThirdPartyParams {+ pub uuid: Uuid,+ pub email: String,+}diff --git a/frontend/rust-lib/flowy-user-deps/src/lib.rs b/frontend/rust-lib/flowy-user-deps/src/lib.rsnew file mode 100644index 0000000000..ee0ade69c4--- /dev/null+++ b/frontend/rust-lib/flowy-user-deps/src/lib.rs@@ -0,0 +1,2 @@+pub mod cloud;+pub mod entities;diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.tomlindex 3db06ae91c..1b0515889d 100644--- a/frontend/rust-lib/flowy-user/Cargo.toml+++ b/frontend/rust-lib/flowy-user/Cargo.toml@@ -8,7 +8,7 @@ edition = "2018"[dependencies]flowy-derive = { path = "../../../shared-lib/flowy-derive" }flowy-sqlite = { path = "../flowy-sqlite", optional = true }-flowy-error = { path = "../flowy-error", features = ["adaptor_database", "adaptor_dispatch"] }+flowy-error = { path = "../flowy-error", features = ["impl_from_sqlite", "impl_from_dispatch_error"] }lib-infra = { path = "../../../shared-lib/lib-infra" }flowy-notification = { path = "../flowy-notification" }flowy-server-config = { path = "../flowy-server-config" }@@ -16,6 +16,7 @@ lib-dispatch = { path = "../lib-dispatch" }appflowy-integrate = { version = "0.1.0" }collab = { version = "0.1.0" }collab-folder = { version = "0.1.0" }+flowy-user-deps = { path = "../flowy-user-deps" }tracing = { version = "0.1", features = ["log"] }bytes = "1.4"@@ -29,13 +30,14 @@ diesel = {version = "1.4.8", features = ["sqlite"]}diesel_derives = {version = "1.4.1", features = ["sqlite"]}once_cell = "1.17.1"parking_lot = "0.12.1"-strum = "0.21"strum_macros = "0.21"tokio = { version = "1.26", features = ["rt"] }validator = "0.16.0"unicode-segmentation = "1.10"fancy-regex = "0.11.0"uuid = { version = "1.3.3", features = [ "v4"] }+chrono = { version = "0.4.22", default-features = false, features = ["clock"] }+base64 = "^0.21"[dev-dependencies]nanoid = "0.4.0"diff --git a/frontend/rust-lib/flowy-user/src/entities/auth.rs b/frontend/rust-lib/flowy-user/src/entities/auth.rsindex eb4d2d066c..a76054758b 100644--- a/frontend/rust-lib/flowy-user/src/entities/auth.rs+++ b/frontend/rust-lib/flowy-user/src/entities/auth.rs@@ -1,14 +1,11 @@use std::collections::HashMap;use std::convert::TryInto;-use serde::{Deserialize, Serialize};-use flowy_derive::{ProtoBuf, ProtoBuf_Enum};+use flowy_user_deps::entities::*;use crate::entities::parser::*;use crate::errors::ErrorCode;-use crate::event_map::UserCredentials;-use crate::services::AuthType;#[derive(ProtoBuf, Default)]pub struct SignInPayloadPB {@@ -77,43 +74,6 @@ impl TryInto<SignUpParams> for SignUpPayloadPB {}}-#[derive(Default, Serialize, Deserialize, Debug)]-pub struct SignInParams {- pub email: String,- pub password: String,- pub name: String,- pub auth_type: AuthType,- // Currently, the uid only used in local sign in.- pub uid: Option<i64>,-}--#[derive(Debug, Default, Serialize, Deserialize, Clone)]-pub struct SignInResponse {- pub user_id: i64,- pub name: String,- pub workspace_id: String,- pub email: Option<String>,- pub token: Option<String>,-}--#[derive(Serialize, Deserialize, Default, Debug)]-pub struct SignUpParams {- pub email: String,- pub name: String,- pub password: String,- pub auth_type: AuthType,-}--#[derive(Serialize, Deserialize, Debug, Default, Clone)]-pub struct SignUpResponse {- pub user_id: i64,- pub name: String,- pub workspace_id: String,- pub is_new: bool,- pub email: Option<String>,- pub token: Option<String>,-}-#[derive(ProtoBuf, Default)]pub struct ThirdPartyAuthPB {/// Use this field to store the third party auth information.@@ -141,64 +101,6 @@ impl Default for AuthTypePB {}}-#[derive(Serialize, Deserialize, Default, Debug, Clone)]-pub struct UserProfile {- pub id: i64,- pub email: String,- pub name: String,- pub token: String,- pub icon_url: String,- pub openai_key: String,- pub workspace_id: String,- pub auth_type: AuthType,-}--#[derive(Serialize, Deserialize, Default, Clone, Debug)]-pub struct UpdateUserProfileParams {- pub id: i64,- pub auth_type: AuthType,- pub name: Option<String>,- pub email: Option<String>,- pub password: Option<String>,- pub icon_url: Option<String>,- pub openai_key: Option<String>,-}--impl UpdateUserProfileParams {- pub fn name(mut self, name: &str) -> Self {- self.name = Some(name.to_owned());- self- }-- pub fn email(mut self, email: &str) -> Self {- self.email = Some(email.to_owned());- self- }-- pub fn password(mut self, password: &str) -> Self {- self.password = Some(password.to_owned());- self- }-- pub fn icon_url(mut self, icon_url: &str) -> Self {- self.icon_url = Some(icon_url.to_owned());- self- }-- pub fn openai_key(mut self, openai_key: &str) -> Self {- self.openai_key = Some(openai_key.to_owned());- self- }-- pub fn is_empty(&self) -> bool {- self.name.is_none()- && self.email.is_none()- && self.password.is_none()- && self.icon_url.is_none()- && self.openai_key.is_none()- }-}-#[derive(Debug, ProtoBuf, Default)]pub struct UserCredentialsPB {#[pb(index = 1, one_of)]diff --git a/frontend/rust-lib/flowy-user/src/entities/parser/mod.rs b/frontend/rust-lib/flowy-user/src/entities/parser/mod.rsindex c1b08df698..a31d917b4a 100644--- a/frontend/rust-lib/flowy-user/src/entities/parser/mod.rs+++ b/frontend/rust-lib/flowy-user/src/entities/parser/mod.rs@@ -1,3 +1,10 @@+pub use user_email::*;+pub use user_icon::*;+pub use user_id::*;+pub use user_name::*;+pub use user_openai_key::*;+pub use user_password::*;+// https://lexi-lambda.github.io/blog/2019/11/05/parse-don-t-validate/mod user_email;mod user_icon;@@ -5,12 +12,3 @@ mod user_id;mod user_name;mod user_openai_key;mod user_password;-mod user_workspace;--pub use user_email::*;-pub use user_icon::*;-pub use user_id::*;-pub use user_name::*;-pub use user_openai_key::*;-pub use user_password::*;-pub use user_workspace::*;diff --git a/frontend/rust-lib/flowy-user/src/entities/parser/user_workspace.rs b/frontend/rust-lib/flowy-user/src/entities/parser/user_workspace.rsdeleted file mode 100644index a02bf3ec45..0000000000--- a/frontend/rust-lib/flowy-user/src/entities/parser/user_workspace.rs+++ /dev/null@@ -1,20 +0,0 @@-use flowy_error::ErrorCode;--#[derive(Debug)]-pub struct UserWorkspace(pub String);--impl UserWorkspace {- pub fn parse(s: String) -> Result<UserWorkspace, ErrorCode> {- let is_empty_or_whitespace = s.trim().is_empty();- if is_empty_or_whitespace {- return Err(ErrorCode::WorkspaceIdInvalid);- }- Ok(Self(s))- }-}--impl AsRef<str> for UserWorkspace {- fn as_ref(&self) -> &str {- &self.0- }-}diff --git a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs b/frontend/rust-lib/flowy-user/src/entities/user_profile.rsindex c684fe7bce..9b238ebb7b 100644--- a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs+++ b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs@@ -1,9 +1,10 @@use std::convert::TryInto;use flowy_derive::ProtoBuf;+use flowy_user_deps::entities::*;use crate::entities::parser::{UserEmail, UserIcon, UserName, UserOpenaiKey, UserPassword};-use crate::entities::{AuthTypePB, UpdateUserProfileParams, UserProfile};+use crate::entities::AuthTypePB;use crate::errors::ErrorCode;#[derive(Default, ProtoBuf)]@@ -154,3 +155,53 @@ impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {})}}++#[derive(ProtoBuf, Default, Debug, Clone)]+pub struct RepeatedUserWorkspacePB {+ #[pb(index = 1)]+ pub items: Vec<UserWorkspacePB>,+}++impl From<Vec<UserWorkspace>> for RepeatedUserWorkspacePB {+ fn from(workspaces: Vec<UserWorkspace>) -> Self {+ Self {+ items: workspaces.into_iter().map(UserWorkspacePB::from).collect(),+ }+ }+}++#[derive(ProtoBuf, Default, Debug, Clone)]+pub struct UserWorkspacePB {+ #[pb(index = 1)]+ pub id: String,++ #[pb(index = 2)]+ pub name: String,+}++impl From<UserWorkspace> for UserWorkspacePB {+ fn from(value: UserWorkspace) -> Self {+ Self {+ id: value.id,+ name: value.name,+ }+ }+}++#[derive(ProtoBuf, Default)]+pub struct AddWorkspaceUserPB {+ #[pb(index = 1)]+ pub email: String,++ #[pb(index = 2)]+ pub workspace_id: String,+}++#[derive(ProtoBuf, Default)]+pub struct RemoveWorkspaceUserPB {+ #[pb(index = 1)]+ pub email: String,++ #[pb(index = 2)]+ pub workspace_id: String,+}diff --git a/frontend/rust-lib/flowy-user/src/entities/user_setting.rs b/frontend/rust-lib/flowy-user/src/entities/user_setting.rsindex 436e6de21a..04b972984a 100644--- a/frontend/rust-lib/flowy-user/src/entities/user_setting.rs+++ b/frontend/rust-lib/flowy-user/src/entities/user_setting.rs@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_error::FlowyError;-use flowy_server_config::supabase_config::{PostgresConfiguration, SupabaseConfiguration};+use flowy_server_config::supabase_config::SupabaseConfiguration;#[derive(ProtoBuf, Default, Debug, Clone)]pub struct UserPreferencesPB {@@ -115,9 +115,6 @@ pub struct SupabaseConfigPB {jwt_secret: String,#[pb(index = 4)]- pub postgres_config: PostgresConfigurationPB,-- #[pb(index = 5)]enable_sync: bool,}@@ -125,59 +122,50 @@ impl TryFrom<SupabaseConfigPB> for SupabaseConfiguration {type Error = FlowyError;fn try_from(config: SupabaseConfigPB) -> Result<Self, Self::Error> {- let postgres_config = PostgresConfiguration::try_from(config.postgres_config)?;Ok(SupabaseConfiguration {url: config.supabase_url,- key: config.key,+ anon_key: config.key,jwt_secret: config.jwt_secret,enable_sync: config.enable_sync,- postgres_config,})}}impl From<SupabaseConfiguration> for SupabaseConfigPB {fn from(value: SupabaseConfiguration) -> Self {- let postgres_config = PostgresConfigurationPB {- url: value.postgres_config.url,- user_name: value.postgres_config.user_name,- password: value.postgres_config.password,- port: value.postgres_config.port as u32,- };Self {supabase_url: value.url,- key: value.key,+ key: value.anon_key,jwt_secret: value.jwt_secret,- postgres_config,enable_sync: value.enable_sync,}}}-#[derive(Default, ProtoBuf)]-pub struct PostgresConfigurationPB {- #[pb(index = 1)]- pub url: String,-- #[pb(index = 2)]- pub user_name: String,-- #[pb(index = 3)]- pub password: String,-- #[pb(index = 4)]- pub port: u32,+#[derive(ProtoBuf_Enum, Debug, Clone, Eq, PartialEq, Default)]+pub enum NetworkTypePB {+ #[default]+ NetworkUnknown = 0,+ Wifi = 1,+ Cell = 2,+ Ethernet = 3,+ Bluetooth = 4,+ VPN = 5,}-impl TryFrom<PostgresConfigurationPB> for PostgresConfiguration {- type Error = FlowyError;-- fn try_from(config: PostgresConfigurationPB) -> Result<Self, Self::Error> {- Ok(Self {- url: config.url,- user_name: config.user_name,- password: config.password,- port: config.port as u16,- })+impl NetworkTypePB {+ pub fn is_reachable(&self) -> bool {+ match self {+ NetworkTypePB::NetworkUnknown | NetworkTypePB::Bluetooth => false,+ NetworkTypePB::Wifi | NetworkTypePB::Cell | NetworkTypePB::Ethernet | NetworkTypePB::VPN => {+ true+ },+ }}}++#[derive(ProtoBuf, Debug, Default, Clone)]+pub struct NetworkStatePB {+ #[pb(index = 1)]+ pub ty: NetworkTypePB,+}diff --git a/frontend/rust-lib/flowy-user/src/event_handler.rs b/frontend/rust-lib/flowy-user/src/event_handler.rsindex b38b197088..0555c958ae 100644--- a/frontend/rust-lib/flowy-user/src/event_handler.rs+++ b/frontend/rust-lib/flowy-user/src/event_handler.rs@@ -1,21 +1,30 @@use std::convert::TryFrom;+use std::sync::Weak;use std::{convert::TryInto, sync::Arc};-use flowy_error::FlowyError;+use flowy_error::{FlowyError, FlowyResult};use flowy_server_config::supabase_config::SupabaseConfiguration;use flowy_sqlite::kv::KV;+use flowy_user_deps::entities::*;use lib_dispatch::prelude::*;use lib_infra::box_any::BoxAny;use crate::entities::*;-use crate::entities::{SignInParams, SignUpParams, UpdateUserProfileParams};-use crate::services::{get_supabase_config, AuthType, UserSession};+use crate::services::{get_supabase_config, UserSession};++fn upgrade_session(session: AFPluginState<Weak<UserSession>>) -> FlowyResult<Arc<UserSession>> {+ let session = session+ .upgrade()+ .ok_or(FlowyError::internal().context("The user session is already drop"))?;+ Ok(session)+}#[tracing::instrument(level = "debug", name = "sign_in", skip(data, session), fields(email = %data.email), err)]pub async fn sign_in(data: AFPluginData<SignInPayloadPB>,- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> DataResult<UserProfilePB, FlowyError> {+ let session = upgrade_session(session)?;let params: SignInParams = data.into_inner().try_into()?;let auth_type = params.auth_type.clone();session.update_auth_type(&auth_type).await;@@ -39,8 +48,9 @@ pub async fn sign_in()]pub async fn sign_up(data: AFPluginData<SignUpPayloadPB>,- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> DataResult<UserProfilePB, FlowyError> {+ let session = upgrade_session(session)?;let params: SignUpParams = data.into_inner().try_into()?;let auth_type = params.auth_type.clone();session.update_auth_type(&auth_type).await;@@ -50,30 +60,36 @@ pub async fn sign_up(}#[tracing::instrument(level = "debug", skip(session))]-pub async fn init_user_handler(session: AFPluginState<Arc<UserSession>>) -> Result<(), FlowyError> {+pub async fn init_user_handler(+ session: AFPluginState<Weak<UserSession>>,+) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;session.init_user().await?;Ok(())}#[tracing::instrument(level = "debug", skip(session))]pub async fn check_user_handler(- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;session.check_user().await?;Ok(())}#[tracing::instrument(level = "debug", skip(session))]pub async fn get_user_profile_handler(- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> DataResult<UserProfilePB, FlowyError> {+ let session = upgrade_session(session)?;let uid = session.get_session()?.user_id;let user_profile: UserProfilePB = session.get_user_profile(uid, true).await?.into();data_result_ok(user_profile)}#[tracing::instrument(level = "debug", skip(session))]-pub async fn sign_out(session: AFPluginState<Arc<UserSession>>) -> Result<(), FlowyError> {+pub async fn sign_out(session: AFPluginState<Weak<UserSession>>) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;session.sign_out().await?;Ok(())}@@ -81,8 +97,9 @@ pub async fn sign_out(session: AFPluginState<Arc<UserSession>>) -> Result<(), Fl#[tracing::instrument(level = "debug", skip(data, session))]pub async fn update_user_profile_handler(data: AFPluginData<UpdateUserProfilePayloadPB>,- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;let params: UpdateUserProfileParams = data.into_inner().try_into()?;session.update_user_profile(params).await?;Ok(())@@ -125,8 +142,9 @@ pub async fn get_appearance_setting() -> DataResult<AppearanceSettingsPB, FlowyE#[tracing::instrument(level = "debug", skip_all, err)]pub async fn get_user_setting(- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> DataResult<UserSettingPB, FlowyError> {+ let session = upgrade_session(session)?;let user_setting = session.user_setting()?;data_result_ok(user_setting)}@@ -136,8 +154,9 @@ pub async fn get_user_setting(#[tracing::instrument(level = "debug", skip(data, session), err)]pub async fn third_party_auth_handler(data: AFPluginData<ThirdPartyAuthPB>,- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> DataResult<UserProfilePB, FlowyError> {+ let session = upgrade_session(session)?;let params = data.into_inner();let auth_type: AuthType = params.auth_type.into();session.update_auth_type(&auth_type).await;@@ -148,8 +167,9 @@ pub async fn third_party_auth_handler(#[tracing::instrument(level = "debug", skip(data, session), err)]pub async fn set_supabase_config_handler(data: AFPluginData<SupabaseConfigPB>,- session: AFPluginState<Arc<UserSession>>,+ session: AFPluginState<Weak<UserSession>>,) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;let config = SupabaseConfiguration::try_from(data.into_inner())?;session.save_supabase_config(config);Ok(())@@ -157,8 +177,70 @@ pub async fn set_supabase_config_handler(#[tracing::instrument(level = "debug", skip_all, err)]pub async fn get_supabase_config_handler(- _session: AFPluginState<Arc<UserSession>>,+ _session: AFPluginState<Weak<UserSession>>,) -> DataResult<SupabaseConfigPB, FlowyError> {let config = get_supabase_config().unwrap_or_default();data_result_ok(config.into())}++#[tracing::instrument(level = "debug", skip(session), err)]+pub async fn get_all_user_workspace_handler(+ session: AFPluginState<Weak<UserSession>>,+) -> DataResult<RepeatedUserWorkspacePB, FlowyError> {+ let session = upgrade_session(session)?;+ let uid = session.get_session()?.user_id;+ let user_workspaces = session.get_all_user_workspaces(uid)?;+ data_result_ok(user_workspaces.into())+}++#[tracing::instrument(level = "debug", skip(data, session), err)]+pub async fn open_workspace_handler(+ data: AFPluginData<UserWorkspacePB>,+ session: AFPluginState<Weak<UserSession>>,+) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;+ let params = data.into_inner();+ session.open_workspace(¶ms.id).await?;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(data, session), err)]+pub async fn add_user_to_workspace_handler(+ data: AFPluginData<AddWorkspaceUserPB>,+ session: AFPluginState<Weak<UserSession>>,+) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;+ let params = data.into_inner();+ session+ .add_user_to_workspace(params.email, params.workspace_id)+ .await?;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(data, session), err)]+pub async fn remove_user_from_workspace_handler(+ data: AFPluginData<RemoveWorkspaceUserPB>,+ session: AFPluginState<Weak<UserSession>>,+) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;+ let params = data.into_inner();+ session+ .remove_user_to_workspace(params.email, params.workspace_id)+ .await?;+ Ok(())+}++#[tracing::instrument(level = "debug", skip(data, session), err)]+pub async fn update_network_state_handler(+ data: AFPluginData<NetworkStatePB>,+ session: AFPluginState<Weak<UserSession>>,+) -> Result<(), FlowyError> {+ let session = upgrade_session(session)?;+ let reachable = data.into_inner().ty.is_reachable();+ session+ .user_status_callback+ .read()+ .await+ .did_update_network(reachable);+ Ok(())+}diff --git a/frontend/rust-lib/flowy-user/src/event_map.rs b/frontend/rust-lib/flowy-user/src/event_map.rsindex 9aa4e891aa..4e2ea2eae8 100644--- a/frontend/rust-lib/flowy-user/src/event_map.rs+++ b/frontend/rust-lib/flowy-user/src/event_map.rs@@ -1,4 +1,4 @@-use std::sync::Arc;+use std::sync::{Arc, Weak};use collab_folder::core::FolderData;use strum_macros::Display;@@ -6,16 +6,15 @@ use strum_macros::Display;use flowy_derive::{Flowy_Event, ProtoBuf_Enum};use flowy_error::FlowyResult;use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_user_deps::cloud::UserService;+use flowy_user_deps::entities::*;use lib_dispatch::prelude::*;-use lib_infra::box_any::BoxAny;-use lib_infra::future::{to_fut, Fut, FutureResult};+use lib_infra::future::{to_fut, Fut};-use crate::entities::{SignInResponse, SignUpResponse, UpdateUserProfileParams, UserProfile};use crate::event_handler::*;-use crate::services::AuthType;use crate::{errors::FlowyError, services::UserSession};-pub fn init(user_session: Arc<UserSession>) -> AFPlugin {+pub fn init(user_session: Weak<UserSession>) -> AFPlugin {AFPlugin::new().name("Flowy-User").state(user_session)@@ -32,6 +31,17 @@ pub fn init(user_session: Arc<UserSession>) -> AFPlugin {.event(UserEvent::SetSupabaseConfig, set_supabase_config_handler).event(UserEvent::GetSupabaseConfig, get_supabase_config_handler).event(UserEvent::ThirdPartyAuth, third_party_auth_handler)+ .event(+ UserEvent::GetAllUserWorkspaces,+ get_all_user_workspace_handler,+ )+ .event(UserEvent::OpenWorkspace, open_workspace_handler)+ .event(UserEvent::AddUserToWorkspace, add_user_to_workspace_handler)+ .event(+ UserEvent::RemoveUserToWorkspace,+ remove_user_from_workspace_handler,+ )+ .event(UserEvent::UpdateNetworkState, update_network_state_handler)}pub struct SignUpContext {@@ -48,13 +58,20 @@ pub trait UserStatusCallback: Send + Sync + 'static {fn auth_type_did_changed(&self, auth_type: AuthType);/// This will be called after the application launches if the user is already signed in./// If the user is not signed in, this method will not be called- fn did_init(&self, user_id: i64, workspace_id: &str) -> Fut<FlowyResult<()>>;+ fn did_init(&self, user_id: i64, user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>>;/// Will be called after the user signed in.- fn did_sign_in(&self, user_id: i64, workspace_id: &str) -> Fut<FlowyResult<()>>;+ fn did_sign_in(&self, user_id: i64, user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>>;/// Will be called after the user signed up.- fn did_sign_up(&self, context: SignUpContext, user_profile: &UserProfile)- -> Fut<FlowyResult<()>>;+ fn did_sign_up(+ &self,+ context: SignUpContext,+ user_profile: &UserProfile,+ user_workspace: &UserWorkspace,+ ) -> Fut<FlowyResult<()>>;+fn did_expired(&self, token: &str, user_id: i64) -> Fut<FlowyResult<()>>;+ fn open_workspace(&self, user_id: i64, user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>>;+ fn did_update_network(&self, reachable: bool);}/// The user cloud service provider.@@ -62,7 +79,7 @@ pub trait UserStatusCallback: Send + Sync + 'static {pub trait UserCloudServiceProvider: Send + Sync + 'static {fn update_supabase_config(&self, supabase_config: &SupabaseConfiguration);fn set_auth_type(&self, auth_type: AuthType);- fn get_auth_service(&self) -> Result<Arc<dyn UserAuthService>, FlowyError>;+ fn get_user_service(&self) -> Result<Arc<dyn UserService>, FlowyError>;}impl<T> UserCloudServiceProvider for Arc<T>@@ -77,87 +94,21 @@ where(**self).set_auth_type(auth_type)}- fn get_auth_service(&self) -> Result<Arc<dyn UserAuthService>, FlowyError> {- (**self).get_auth_service()+ fn get_user_service(&self) -> Result<Arc<dyn UserService>, FlowyError> {+ (**self).get_user_service()}}-#[derive(Clone, Debug)]-pub struct UserCredentials {- /// Currently, the token is only used when the [AuthType] is SelfHosted- pub token: Option<String>,-- /// The user id- pub uid: Option<i64>,-- /// The user id- pub uuid: Option<String>,-}--impl UserCredentials {- pub fn from_uid(uid: i64) -> Self {- Self {- token: None,- uid: Some(uid),- uuid: None,- }- }-- pub fn from_uuid(uuid: String) -> Self {- Self {- token: None,- uid: None,- uuid: Some(uuid),- }- }-- pub fn new(token: Option<String>, uid: Option<i64>, uuid: Option<String>) -> Self {- Self { token, uid, uuid }- }-}--/// Provide the generic interface for the user cloud service-/// The user cloud service is responsible for the user authentication and user profile management-pub trait UserAuthService: Send + Sync {- /// Sign up a new account.- /// The type of the params is defined the this trait's implementation.- /// Use the `unbox_or_error` of the [BoxAny] to get the params.- fn sign_up(&self, params: BoxAny) -> FutureResult<SignUpResponse, FlowyError>;-- /// Sign in an account- /// The type of the params is defined the this trait's implementation.- fn sign_in(&self, params: BoxAny) -> FutureResult<SignInResponse, FlowyError>;-- /// Sign out an account- fn sign_out(&self, token: Option<String>) -> FutureResult<(), FlowyError>;-- /// Using the user's token to update the user information- fn update_user(- &self,- credential: UserCredentials,- params: UpdateUserProfileParams,- ) -> FutureResult<(), FlowyError>;-- /// Get the user information using the user's token or uid- /// return None if the user is not found- fn get_user_profile(- &self,- credential: UserCredentials,- ) -> FutureResult<Option<UserProfile>, FlowyError>;-- fn check_user(&self, credential: UserCredentials) -> FutureResult<(), FlowyError>;-}-/// Acts as a placeholder [UserStatusCallback] for the user session, but does not perform any functionpub(crate) struct DefaultUserStatusCallback;impl UserStatusCallback for DefaultUserStatusCallback {fn auth_type_did_changed(&self, _auth_type: AuthType) {}- fn did_init(&self, _user_id: i64, _workspace_id: &str) -> Fut<FlowyResult<()>> {+ fn did_init(&self, _user_id: i64, _user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>> {to_fut(async { Ok(()) })}- fn did_sign_in(&self, _user_id: i64, _workspace_id: &str) -> Fut<FlowyResult<()>> {+ fn did_sign_in(&self, _user_id: i64, _user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>> {to_fut(async { Ok(()) })}@@ -165,6 +116,7 @@ impl UserStatusCallback for DefaultUserStatusCallback {&self,_context: SignUpContext,_user_profile: &UserProfile,+ _user_workspace: &UserWorkspace,) -> Fut<FlowyResult<()>> {to_fut(async { Ok(()) })}@@ -172,6 +124,12 @@ impl UserStatusCallback for DefaultUserStatusCallback {fn did_expired(&self, _token: &str, _user_id: i64) -> Fut<FlowyResult<()>> {to_fut(async { Ok(()) })}++ fn open_workspace(&self, _user_id: i64, _user_workspace: &UserWorkspace) -> Fut<FlowyResult<()>> {+ to_fut(async { Ok(()) })+ }++ fn did_update_network(&self, _reachable: bool) {}}#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]@@ -229,4 +187,20 @@ pub enum UserEvent {#[event(output = "SupabaseConfigPB")]GetSupabaseConfig = 14,++ /// Return the all the workspaces of the user+ #[event()]+ GetAllUserWorkspaces = 20,++ #[event(input = "UserWorkspacePB")]+ OpenWorkspace = 21,++ #[event(input = "AddWorkspaceUserPB")]+ AddUserToWorkspace = 22,++ #[event(input = "RemoveWorkspaceUserPB")]+ RemoveUserToWorkspace = 23,++ #[event(input = "NetworkStatePB")]+ UpdateNetworkState = 24,}diff --git a/frontend/rust-lib/flowy-user/src/notification.rs b/frontend/rust-lib/flowy-user/src/notification.rsindex f8cc06f3d0..2b9ad7b01b 100644--- a/frontend/rust-lib/flowy-user/src/notification.rs+++ b/frontend/rust-lib/flowy-user/src/notification.rs@@ -1,5 +1,6 @@use flowy_derive::ProtoBuf_Enum;use flowy_notification::NotificationBuilder;+const USER_OBSERVABLE_SOURCE: &str = "User";#[derive(ProtoBuf_Enum, Debug, Default)]@@ -8,6 +9,7 @@ pub(crate) enum UserNotification {Unknown = 0,DidUserSignIn = 1,DidUpdateUserProfile = 2,+ DidUpdateUserWorkspaces = 3,}impl std::convert::From<UserNotification> for i32 {diff --git a/frontend/rust-lib/flowy-user/src/services/database.rs b/frontend/rust-lib/flowy-user/src/services/database.rsindex 5084309faa..77f1bd7ddf 100644--- a/frontend/rust-lib/flowy-user/src/services/database.rs+++ b/frontend/rust-lib/flowy-user/src/services/database.rs@@ -6,15 +6,17 @@ use lazy_static::lazy_static;use parking_lot::RwLock;use flowy_error::{ErrorCode, FlowyError};+use flowy_sqlite::schema::user_workspace_table;use flowy_sqlite::ConnectionPool;use flowy_sqlite::{query_dsl::*,schema::{user_table, user_table::dsl},DBConnection, Database, ExpressionMethods,};+use flowy_user_deps::entities::{UserProfile, UserWorkspace};-use crate::entities::{SignInResponse, SignUpResponse, UpdateUserProfileParams, UserProfile};-use crate::services::AuthType;+use crate::services::user_sql::UserTable;+use crate::services::user_workspace_sql::UserWorkspaceTable;pub struct UserDB {root: String,@@ -30,11 +32,13 @@ impl UserDB {/// Close the database connection for the user.pub(crate) fn close(&self, user_id: i64) -> Result<(), FlowyError> {if let Some(mut sqlite_dbs) = DB_MAP.try_write_for(Duration::from_millis(300)) {+ tracing::trace!("close sqlite db for user {}", user_id);sqlite_dbs.remove(&user_id);}if let Some(mut collab_dbs) = COLLAB_DB_MAP.try_write_for(Duration::from_millis(300)) {if let Some(db) = collab_dbs.remove(&user_id) {+ tracing::trace!("close collab db for user {}", user_id);drop(db);}}@@ -83,6 +87,17 @@ pub fn get_user_profile(pool: &Arc<ConnectionPool>, uid: i64) -> Result<UserProfOk(user.into())}+pub fn get_user_workspace(+ pool: &Arc<ConnectionPool>,+ uid: i64,+) -> Result<Option<UserWorkspace>, FlowyError> {+ let conn = pool.get()?;+ let row = user_workspace_table::dsl::user_workspace_table+ .filter(user_workspace_table::uid.eq(uid))+ .first::<UserWorkspaceTable>(&*conn)?;+ Ok(Some(UserWorkspace::from(row)))+}+pub fn user_db_path_from_uid(root: &str, uid: i64) -> PathBuf {let mut dir = PathBuf::new();dir.push(root);@@ -126,108 +141,3 @@ lazy_static! {static ref DB_MAP: RwLock<HashMap<i64, Database>> = RwLock::new(HashMap::new());static ref COLLAB_DB_MAP: RwLock<HashMap<i64, Arc<RocksCollabDB>>> = RwLock::new(HashMap::new());}--/// The order of the fields in the struct must be the same as the order of the fields in the table.-/// Check out the [schema.rs] for table schema.-#[derive(Clone, Default, Queryable, Identifiable, Insertable)]-#[table_name = "user_table"]-pub struct UserTable {- pub(crate) id: String,- pub(crate) name: String,- pub(crate) workspace: String,- pub(crate) icon_url: String,- pub(crate) openai_key: String,- pub(crate) token: String,- pub(crate) email: String,- pub(crate) auth_type: i32,-}--impl UserTable {- pub fn set_workspace(mut self, workspace: String) -> Self {- self.workspace = workspace;- self- }-}--impl From<(SignUpResponse, AuthType)> for UserTable {- fn from(params: (SignUpResponse, AuthType)) -> Self {- let resp = params.0;- UserTable {- id: resp.user_id.to_string(),- name: resp.name,- token: resp.token.unwrap_or_default(),- email: resp.email.unwrap_or_default(),- workspace: resp.workspace_id,- icon_url: "".to_string(),- openai_key: "".to_string(),- auth_type: params.1 as i32,- }- }-}--impl From<(SignInResponse, AuthType)> for UserTable {- fn from(params: (SignInResponse, AuthType)) -> Self {- let resp = params.0;- let auth_type = params.1;- UserTable {- id: resp.user_id.to_string(),- name: resp.name,- token: resp.token.unwrap_or_default(),- email: resp.email.unwrap_or_default(),- workspace: resp.workspace_id,- icon_url: "".to_string(),- openai_key: "".to_string(),- auth_type: auth_type as i32,- }- }-}--impl From<UserTable> for UserProfile {- fn from(table: UserTable) -> Self {- UserProfile {- id: table.id.parse::<i64>().unwrap_or(0),- email: table.email,- name: table.name,- token: table.token,- icon_url: table.icon_url,- openai_key: table.openai_key,- workspace_id: table.workspace,- auth_type: AuthType::from(table.auth_type),- }- }-}--#[derive(AsChangeset, Identifiable, Default, Debug)]-#[table_name = "user_table"]-pub struct UserTableChangeset {- pub id: String,- pub workspace: Option<String>, // deprecated- pub name: Option<String>,- pub email: Option<String>,- pub icon_url: Option<String>,- pub openai_key: Option<String>,-}--impl UserTableChangeset {- pub fn new(params: UpdateUserProfileParams) -> Self {- UserTableChangeset {- id: params.id.to_string(),- workspace: None,- name: params.name,- email: params.email,- icon_url: params.icon_url,- openai_key: params.openai_key,- }- }-- pub fn from_user_profile(user_profile: UserProfile) -> Self {- UserTableChangeset {- id: user_profile.id.to_string(),- workspace: None,- name: Some(user_profile.name),- email: Some(user_profile.email),- icon_url: Some(user_profile.icon_url),- openai_key: Some(user_profile.openai_key),- }- }-}diff --git a/frontend/rust-lib/flowy-user/src/services/mod.rs b/frontend/rust-lib/flowy-user/src/services/mod.rsindex 428866a33a..44b1300cab 100644--- a/frontend/rust-lib/flowy-user/src/services/mod.rs+++ b/frontend/rust-lib/flowy-user/src/services/mod.rs@@ -1,5 +1,8 @@pub use user_session::*;pub mod database;-mod user_data;+mod session_serde;+mod user_data_migration;mod user_session;+mod user_sql;+mod user_workspace_sql;diff --git a/frontend/rust-lib/flowy-user/src/services/session_serde.rs b/frontend/rust-lib/flowy-user/src/services/session_serde.rsnew file mode 100644index 0000000000..6e93a26706--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/services/session_serde.rs@@ -0,0 +1,124 @@+use std::fmt;++use base64::engine::general_purpose::STANDARD;+use base64::Engine;+use chrono::prelude::*;+use serde::de::{Deserializer, MapAccess, Visitor};+use serde::Deserialize;+use serde::Serialize;++use flowy_user_deps::entities::{SignInResponse, UserWorkspace};++#[derive(Debug, Clone, Serialize)]+pub struct Session {+ pub user_id: i64,+ pub user_workspace: UserWorkspace,+}++struct SessionVisitor;+impl<'de> Visitor<'de> for SessionVisitor {+ type Value = Session;++ fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {+ formatter.write_str("Session")+ }++ fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>+ where+ M: MapAccess<'de>,+ {+ let mut user_id = None;+ // For historical reasons, the session used to contain a workspace_id field.+ // This field is no longer used, and is replaced by user_workspace.+ let mut workspace_id = None;+ let mut user_workspace = None;++ while let Some(key) = map.next_key::<String>()? {+ match key.as_str() {+ "user_id" => {+ user_id = Some(map.next_value()?);+ },+ "workspace_id" => {+ workspace_id = Some(map.next_value()?);+ },+ "user_workspace" => {+ user_workspace = Some(map.next_value()?);+ },+ _ => {},+ }+ }+ let user_id = user_id.ok_or(serde::de::Error::missing_field("user_id"))?;+ if user_workspace.is_none() {+ if let Some(workspace_id) = workspace_id {+ user_workspace = Some(UserWorkspace {+ id: workspace_id,+ name: "My Workspace".to_string(),+ created_at: Utc::now(),+ // For historical reasons, the database_storage_id is constructed by the user_id.+ database_storage_id: STANDARD.encode(format!("{}:user:database", user_id)),+ })+ }+ }++ let session = Session {+ user_id,+ user_workspace: user_workspace.ok_or(serde::de::Error::missing_field("user_workspace"))?,+ };++ Ok(session)+ }+}++impl<'de> Deserialize<'de> for Session {+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>+ where+ D: Deserializer<'de>,+ {+ deserializer.deserialize_any(SessionVisitor)+ }+}++impl std::convert::From<SignInResponse> for Session {+ fn from(resp: SignInResponse) -> Self {+ Session {+ user_id: resp.user_id,+ user_workspace: resp.latest_workspace,+ }+ }+}++impl std::convert::From<Session> for String {+ fn from(session: Session) -> Self {+ match serde_json::to_string(&session) {+ Ok(s) => s,+ Err(e) => {+ tracing::error!("Serialize session to string failed: {:?}", e);+ "".to_string()+ },+ }+ }+}++#[cfg(test)]+mod tests {+ use super::*;++ #[derive(serde::Serialize)]+ struct OldSession {+ user_id: i64,+ workspace_id: String,+ }++ #[test]+ fn deserialize_user_workspace_from_workspace_id() {+ // For historical reasons, the session used to contain a workspace_id field.+ let old = OldSession {+ user_id: 1,+ workspace_id: uuid::Uuid::new_v4().to_string(),+ };+ let s = serde_json::to_string(&old).unwrap();+ let new = serde_json::from_str::<Session>(&s).unwrap();+ assert_eq!(old.user_id, new.user_id);+ assert_eq!(old.workspace_id, new.user_workspace.id);+ }+}diff --git a/frontend/rust-lib/flowy-user/src/services/user_data.rs b/frontend/rust-lib/flowy-user/src/services/user_data.rsdeleted file mode 100644index 4d3d9dbe25..0000000000--- a/frontend/rust-lib/flowy-user/src/services/user_data.rs+++ /dev/null@@ -1,91 +0,0 @@-use std::sync::Arc;--use appflowy_integrate::{RocksCollabDB, YrsDocAction};-use collab::core::collab::MutexCollab;-use collab::core::origin::{CollabClient, CollabOrigin};-use collab::preclude::Collab;--use collab_folder::core::{Folder, FolderData};-use flowy_error::{ErrorCode, FlowyError, FlowyResult};--pub struct UserDataMigration();--impl UserDataMigration {- pub fn migration(- old_uid: i64,- old_collab_db: &Arc<RocksCollabDB>,- old_workspace_id: &str,- new_uid: i64,- new_collab_db: &Arc<RocksCollabDB>,- new_workspace_id: &str,- ) -> FlowyResult<Option<FolderData>> {- let mut folder_data = None;- new_collab_db- .with_write_txn(|w_txn| {- let read_txn = old_collab_db.read_txn();- if let Ok(object_ids) = read_txn.get_all_docs() {- // Migration of all objects- for object_id in object_ids {- tracing::debug!("migrate object: {:?}", object_id);- if let Ok(updates) = read_txn.get_all_updates(old_uid, &object_id) {- // If the object is a folder, migrate the folder data- if object_id == old_workspace_id {- let origin = CollabOrigin::Client(CollabClient::new(old_uid, ""));- if let Ok(old_folder_collab) =- Collab::new_with_raw_data(origin, &object_id, updates, vec![])- {- let mutex_collab = Arc::new(MutexCollab::from_collab(old_folder_collab));- let old_folder = Folder::open(mutex_collab, None);- folder_data = migrate_folder(new_workspace_id, old_folder);- }- } else {- let origin = CollabOrigin::Client(CollabClient::new(new_uid, ""));- match Collab::new_with_raw_data(origin, &object_id, updates, vec![]) {- Ok(collab) => {- let txn = collab.transact();- if let Err(err) = w_txn.create_new_doc(new_uid, &object_id, &txn) {- tracing::error!("🔴migrate collab failed: {:?}", err);- }- },- Err(err) => tracing::error!("🔴construct migration collab failed: {:?} ", err),- }- }- }- }- }- Ok(())- })- .map_err(|err| FlowyError::new(ErrorCode::Internal, err))?;- Ok(folder_data)- }-}--fn migrate_folder(new_workspace_id: &str, old_folder: Folder) -> Option<FolderData> {- let mut folder_data = old_folder.get_folder_data()?;- let old_workspace_id = folder_data.current_workspace_id;- folder_data.current_workspace_id = new_workspace_id.to_string();-- let mut workspace = folder_data.workspaces.pop()?;- if folder_data.workspaces.len() > 1 {- tracing::error!("🔴migrate folder: more than one workspace");- }- workspace.id = new_workspace_id.to_string();-- // Only take one workspace- folder_data.workspaces.clear();- folder_data.workspaces.push(workspace);-- // Update the view's parent view id to new workspace id- folder_data.views.iter_mut().for_each(|view| {- if view.parent_view_id == old_workspace_id {- view.parent_view_id = new_workspace_id.to_string();- }- });-- Some(folder_data)-}--// fn open_collab_db(uid: i64, root: String) -> FlowyResult<RocksCollabDB> {-// let dir = collab_db_path_from_uid(&root, uid);-// RocksCollabDB::open(dir).map_err(|err| FlowyError::new(ErrorCode::Internal, err))-// }diff --git a/frontend/rust-lib/flowy-user/src/services/user_data_migration.rs b/frontend/rust-lib/flowy-user/src/services/user_data_migration.rsnew file mode 100644index 0000000000..c779bb21f7--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/services/user_data_migration.rs@@ -0,0 +1,151 @@+use std::sync::Arc;++use appflowy_integrate::{PersistenceError, RocksCollabDB, YrsDocAction};+use collab::core::collab::{CollabRawData, MutexCollab};+use collab::core::origin::{CollabClient, CollabOrigin};+use collab::preclude::Collab;+use collab_folder::core::{Folder, FolderData};++use flowy_error::{ErrorCode, FlowyError, FlowyResult};+use flowy_user_deps::entities::UserProfile;++use crate::services::session_serde::Session;++pub struct UserDataMigration();++pub struct UserMigrationContext {+ pub user_profile: UserProfile,+ pub session: Session,+}++impl UserDataMigration {+ pub fn migration(+ old_user: &UserMigrationContext,+ old_collab_db: &Arc<RocksCollabDB>,+ new_user: &UserMigrationContext,+ new_collab_db: &Arc<RocksCollabDB>,+ ) -> FlowyResult<Option<FolderData>> {+ let mut folder_data = None;+ new_collab_db+ .with_write_txn(|w_txn| {+ let read_txn = old_collab_db.read_txn();+ if let Ok(object_ids) = read_txn.get_all_docs() {+ // Migration of all objects+ for object_id in object_ids {+ tracing::debug!("migrate object: {:?}", object_id);+ if let Ok(updates) = read_txn.get_all_updates(old_user.session.user_id, &object_id) {+ // If the object is a folder, migrate the folder data+ if object_id == old_user.session.user_workspace.id {+ folder_data = migrate_folder(+ old_user.session.user_id,+ &object_id,+ &new_user.session.user_workspace.id,+ updates,+ );+ } else if object_id == old_user.session.user_workspace.database_storage_id {+ migrate_database_storage(+ old_user.session.user_id,+ &object_id,+ new_user.session.user_id,+ &new_user.session.user_workspace.database_storage_id,+ updates,+ w_txn,+ );+ } else {+ migrate_object(+ old_user.session.user_id,+ new_user.session.user_id,+ &object_id,+ updates,+ w_txn,+ );+ }+ }+ }+ }+ Ok(())+ })+ .map_err(|err| FlowyError::new(ErrorCode::Internal, err))?;+ Ok(folder_data)+ }+}++fn migrate_database_storage<'a, W>(+ old_uid: i64,+ old_object_id: &str,+ new_uid: i64,+ new_object_id: &str,+ updates: CollabRawData,+ w_txn: &'a W,+) where+ W: YrsDocAction<'a>,+ PersistenceError: From<W::Error>,+{+ let origin = CollabOrigin::Client(CollabClient::new(old_uid, ""));+ match Collab::new_with_raw_data(origin, old_object_id, updates, vec![]) {+ Ok(collab) => {+ let txn = collab.transact();+ if let Err(err) = w_txn.create_new_doc(new_uid, new_object_id, &txn) {+ tracing::error!("🔴migrate database storage failed: {:?}", err);+ }+ },+ Err(err) => tracing::error!("🔴construct migration database storage failed: {:?} ", err),+ }+}++fn migrate_object<'a, W>(+ old_uid: i64,+ new_uid: i64,+ object_id: &str,+ updates: CollabRawData,+ w_txn: &'a W,+) where+ W: YrsDocAction<'a>,+ PersistenceError: From<W::Error>,+{+ let origin = CollabOrigin::Client(CollabClient::new(old_uid, ""));+ match Collab::new_with_raw_data(origin, object_id, updates, vec![]) {+ Ok(collab) => {+ let txn = collab.transact();+ if let Err(err) = w_txn.create_new_doc(new_uid, object_id, &txn) {+ tracing::error!("🔴migrate collab failed: {:?}", err);+ }+ },+ Err(err) => tracing::error!("🔴construct migration collab failed: {:?} ", err),+ }+}++fn migrate_folder(+ old_uid: i64,+ old_object_id: &str,+ new_workspace_id: &str,+ updates: CollabRawData,+) -> Option<FolderData> {+ let origin = CollabOrigin::Client(CollabClient::new(old_uid, ""));+ let old_folder_collab = Collab::new_with_raw_data(origin, old_object_id, updates, vec![]).ok()?;+ let mutex_collab = Arc::new(MutexCollab::from_collab(old_folder_collab));+ let old_folder = Folder::open(mutex_collab, None);++ let mut folder_data = old_folder.get_folder_data()?;+ let old_workspace_id = folder_data.current_workspace_id;+ folder_data.current_workspace_id = new_workspace_id.to_string();++ let mut workspace = folder_data.workspaces.pop()?;+ if folder_data.workspaces.len() > 1 {+ tracing::error!("🔴migrate folder: more than one workspace");+ }+ workspace.id = new_workspace_id.to_string();++ // Only take one workspace+ folder_data.workspaces.clear();+ folder_data.workspaces.push(workspace);++ // Update the view's parent view id to new workspace id+ folder_data.views.iter_mut().for_each(|view| {+ if view.parent_view_id == old_workspace_id {+ view.parent_view_id = new_workspace_id.to_string();+ }+ });++ Some(folder_data)+}diff --git a/frontend/rust-lib/flowy-user/src/services/user_session.rs b/frontend/rust-lib/flowy-user/src/services/user_session.rsindex 141120d40b..0c40bc0d3e 100644--- a/frontend/rust-lib/flowy-user/src/services/user_session.rs+++ b/frontend/rust-lib/flowy-user/src/services/user_session.rs@@ -1,41 +1,35 @@-use std::collections::HashMap;-use std::str::FromStr;-use std::sync::Arc;+use std::sync::{Arc, Weak};use appflowy_integrate::RocksCollabDB;use collab_folder::core::FolderData;use serde::{Deserialize, Serialize};-use serde_repr::*;use tokio::sync::RwLock;use uuid::Uuid;-use flowy_error::{internal_error, ErrorCode};+use flowy_error::{internal_error, ErrorCode, FlowyResult};use flowy_server_config::supabase_config::SupabaseConfiguration;+use flowy_sqlite::schema::{user_table, user_workspace_table};use flowy_sqlite::ConnectionPool;-use flowy_sqlite::{- kv::KV,- query_dsl::*,- schema::{user_table, user_table::dsl},- DBConnection, ExpressionMethods,-};+use flowy_sqlite::{kv::KV, query_dsl::*, DBConnection, ExpressionMethods};+use flowy_user_deps::entities::*;use lib_infra::box_any::BoxAny;+use lib_infra::util::timestamp;-use crate::entities::{- AuthTypePB, SignInResponse, SignUpResponse, UpdateUserProfileParams, UserProfile,-};+use crate::entities::{AuthTypePB, RepeatedUserWorkspacePB};use crate::entities::{UserProfilePB, UserSettingPB};use crate::event_map::{- DefaultUserStatusCallback, SignUpContext, UserCloudServiceProvider, UserCredentials,- UserStatusCallback,-};-use crate::services::user_data::UserDataMigration;-use crate::{- errors::FlowyError,- notification::*,- services::database::{UserDB, UserTable, UserTableChangeset},+ DefaultUserStatusCallback, SignUpContext, UserCloudServiceProvider, UserStatusCallback,};+use crate::services::database::UserDB;+use crate::services::session_serde::Session;+use crate::services::user_data_migration::{UserDataMigration, UserMigrationContext};+use crate::services::user_sql::{UserTable, UserTableChangeset};+use crate::services::user_workspace_sql::UserWorkspaceTable;+use crate::{errors::FlowyError, notification::*};++const HISTORICAL_USER: &str = "af_historical_users";+const SUPABASE_CONFIG_CACHE_KEY: &str = "af_supabase_config";-pub(crate) const SUPABASE_CONFIG_CACHE_KEY: &str = "supabase_config_cache_key";pub struct UserSessionConfig {root_dir: String,@@ -59,7 +53,7 @@ pub struct UserSession {database: UserDB,session_config: UserSessionConfig,cloud_services: Arc<dyn UserCloudServiceProvider>,- user_status_callback: RwLock<Arc<dyn UserStatusCallback>>,+ pub(crate) user_status_callback: RwLock<Arc<dyn UserStatusCallback>>,}impl UserSession {@@ -67,11 +61,11 @@ impl UserSession {session_config: UserSessionConfig,cloud_services: Arc<dyn UserCloudServiceProvider>,) -> Self {- let db = UserDB::new(&session_config.root_dir);+ let database = UserDB::new(&session_config.root_dir);let user_status_callback: RwLock<Arc<dyn UserStatusCallback>> =RwLock::new(Arc::new(DefaultUserStatusCallback));Self {- database: db,+ database,session_config,cloud_services,user_status_callback,@@ -81,7 +75,7 @@ impl UserSession {pub async fn init<C: UserStatusCallback + 'static>(&self, user_status_callback: C) {if let Ok(session) = self.get_session() {if let Err(e) = user_status_callback- .did_init(session.user_id, &session.workspace_id)+ .did_init(session.user_id, &session.user_workspace).await{tracing::error!("Failed to call did_sign_in callback: {:?}", e);@@ -104,55 +98,57 @@ impl UserSession {self.database.get_pool(uid)}- pub fn get_collab_db(&self, uid: i64) -> Result<Arc<RocksCollabDB>, FlowyError> {- self.database.get_collab_db(uid)+ pub fn get_collab_db(&self, uid: i64) -> Result<Weak<RocksCollabDB>, FlowyError> {+ self+ .database+ .get_collab_db(uid)+ .map(|collab_db| Arc::downgrade(&collab_db))}pub async fn migrate_old_user_data(&self,- old_uid: i64,- old_workspace_id: &str,- new_uid: i64,- new_workspace_id: &str,+ old_user: &UserMigrationContext,+ new_user: &UserMigrationContext,) -> Result<Option<FolderData>, FlowyError> {- let old_collab_db = self.database.get_collab_db(old_uid)?;- let new_collab_db = self.database.get_collab_db(new_uid)?;- let folder_data = UserDataMigration::migration(- old_uid,- &old_collab_db,- old_workspace_id,- new_uid,- &new_collab_db,- new_workspace_id,- )?;+ let old_collab_db = self.database.get_collab_db(old_user.session.user_id)?;+ let new_collab_db = self.database.get_collab_db(new_user.session.user_id)?;+ let folder_data =+ UserDataMigration::migration(old_user, &old_collab_db, new_user, &new_collab_db)?;Ok(folder_data)}- pub fn clear_old_user(&self, old_uid: i64) {- let _ = self.database.close(old_uid);- }-#[tracing::instrument(level = "debug", skip(self, params))]pub async fn sign_in(&self,params: BoxAny,auth_type: AuthType,) -> Result<UserProfile, FlowyError> {- let resp = self+ let resp: SignInResponse = self.cloud_services- .get_auth_service()?+ .get_user_service()?.sign_in(params).await?;let session: Session = resp.clone().into();let uid = session.user_id;self.set_session(Some(session))?;+ self.log_user(uid, self.user_dir(uid));++ let user_workspace = resp.latest_workspace.clone();+ save_user_workspaces(+ self.db_pool(uid)?,+ resp+ .user_workspaces+ .iter()+ .map(|user_workspace| UserWorkspaceTable::from((uid, user_workspace)))+ .collect(),+ )?;let user_profile: UserProfile = self.save_user(uid, (resp, auth_type).into()).await?.into();if let Err(e) = self.user_status_callback.read().await- .did_sign_in(user_profile.id, &user_profile.workspace_id)+ .did_sign_in(user_profile.id, &user_workspace).await{tracing::error!("Failed to call did_sign_in callback: {:?}", e);@@ -180,52 +176,69 @@ impl UserSession {auth_type: AuthType,params: BoxAny,) -> Result<UserProfile, FlowyError> {- let old_user_profile = {+ let old_user = {if let Ok(old_session) = self.get_session() {- self.get_user_profile(old_session.user_id, false).await.ok()+ self+ .get_user_profile(old_session.user_id, false)+ .await+ .ok()+ .map(|user_profile| UserMigrationContext {+ user_profile,+ session: old_session,+ })} else {None}};- let auth_service = self.cloud_services.get_auth_service()?;+ let auth_service = self.cloud_services.get_user_service()?;let response: SignUpResponse = auth_service.sign_up(params).await?;let mut sign_up_context = SignUpContext {is_new: response.is_new,local_folder: None,};- let session = Session {+ let new_session = Session {user_id: response.user_id,- workspace_id: response.workspace_id.clone(),+ user_workspace: response.latest_workspace.clone(),};- let uid = session.user_id;- self.set_session(Some(session))?;+ let uid = new_session.user_id;+ self.set_session(Some(new_session.clone()))?;+ self.log_user(uid, self.user_dir(uid));+ save_user_workspaces(+ self.db_pool(uid)?,+ response+ .user_workspaces+ .iter()+ .map(|user_workspace| UserWorkspaceTable::from((uid, user_workspace)))+ .collect(),+ )?;let user_table = self.save_user(uid, (response, auth_type.clone()).into()).await?;let new_user_profile: UserProfile = user_table.into();- // Only migrate the data if the user is login in as a guest and sign up as a new user+ // Only migrate the data if the user is login in as a guest and sign up as a new user if the current+ // auth type is not [AuthType::Local].if sign_up_context.is_new {- if let Some(old_user_profile) = old_user_profile {- if old_user_profile.auth_type == AuthType::Local && !auth_type.is_local() {+ if let Some(old_user) = old_user {+ if old_user.user_profile.auth_type == AuthType::Local && !auth_type.is_local() {+ let new_user = UserMigrationContext {+ user_profile: new_user_profile.clone(),+ session: new_session.clone(),+ };+tracing::info!("Migrate old user data from {:?} to {:?}",- old_user_profile.id,- new_user_profile.id+ old_user.user_profile.id,+ new_user.user_profile.id);- match self- .migrate_old_user_data(- old_user_profile.id,- &old_user_profile.workspace_id,- new_user_profile.id,- &new_user_profile.workspace_id,- )- .await- {+ match self.migrate_old_user_data(&old_user, &new_user).await {Ok(folder_data) => sign_up_context.local_folder = folder_data,Err(e) => tracing::error!("{:?}", e),}++ // close the old user db+ let _ = self.database.close(old_user.session.user_id);}}}@@ -234,18 +247,22 @@ impl UserSession {.user_status_callback.read().await- .did_sign_up(sign_up_context, &new_user_profile)+ .did_sign_up(+ sign_up_context,+ &new_user_profile,+ &new_session.user_workspace,+ ).await;Ok(new_user_profile)}- #[tracing::instrument(level = "debug", skip(self))]+ #[tracing::instrument(level = "info", skip(self))]pub async fn sign_out(&self) -> Result<(), FlowyError> {let session = self.get_session()?;self.database.close(session.user_id)?;self.set_session(None)?;- let server = self.cloud_services.get_auth_service()?;+ let server = self.cloud_services.get_user_service()?;tokio::spawn(async move {match server.sign_out(None).await {Ok(_) => {},@@ -291,26 +308,70 @@ impl UserSession {pub async fn check_user(&self) -> Result<(), FlowyError> {let user_id = self.get_session()?.user_id;let credential = UserCredentials::from_uid(user_id);- let auth_service = self.cloud_services.get_auth_service()?;- auth_service.check_user(credential).await+ let auth_service = self.cloud_services.get_user_service()?;+ auth_service.check_user(credential).await?;+ Ok(())}pub async fn check_user_with_uuid(&self, uuid: &Uuid) -> Result<(), FlowyError> {let credential = UserCredentials::from_uuid(uuid.to_string());- let auth_service = self.cloud_services.get_auth_service()?;- auth_service.check_user(credential).await+ let auth_service = self.cloud_services.get_user_service()?;+ auth_service.check_user(credential).await?;+ Ok(())+ }++ pub async fn open_workspace(&self, workspace_id: &str) -> FlowyResult<()> {+ let uid = self.user_id()?;+ if let Some(user_workspace) = self.get_user_workspace(uid, workspace_id) {+ if let Err(err) = self+ .user_status_callback+ .read()+ .await+ .open_workspace(uid, &user_workspace)+ .await+ {+ tracing::error!("Open workspace failed: {:?}", err);+ }+ }+ Ok(())+ }++ pub async fn add_user_to_workspace(+ &self,+ user_email: String,+ to_workspace_id: String,+ ) -> FlowyResult<()> {+ self+ .cloud_services+ .get_user_service()?+ .add_workspace_member(user_email, to_workspace_id)+ .await?;+ Ok(())+ }++ pub async fn remove_user_to_workspace(+ &self,+ user_email: String,+ from_workspace_id: String,+ ) -> FlowyResult<()> {+ self+ .cloud_services+ .get_user_service()?+ .remove_workspace_member(user_email, from_workspace_id)+ .await?;+ Ok(())}/// Get the user profile from the database/// If the refresh is true, it will try to get the user profile from the serverpub async fn get_user_profile(&self, uid: i64, refresh: bool) -> Result<UserProfile, FlowyError> {let user_id = uid.to_string();- let user = dsl::user_table+ let user = user_table::dsl::user_table.filter(user_table::id.eq(&user_id)).first::<UserTable>(&*(self.db_connection(uid)?))?;if refresh {- let weak_auth_service = Arc::downgrade(&self.cloud_services.get_auth_service()?);+ let weak_auth_service = Arc::downgrade(&self.cloud_services.get_user_service()?);let weak_pool = Arc::downgrade(&self.database.get_pool(uid)?);tokio::spawn(async move {if let (Some(auth_service), Some(pool)) = (weak_auth_service.upgrade(), weak_pool.upgrade())@@ -321,7 +382,8 @@ impl UserSession {{let changeset = UserTableChangeset::from_user_profile(user_profile.clone());if let Ok(conn) = pool.get() {- let filter = dsl::user_table.filter(dsl::id.eq(changeset.id.clone()));+ let filter =+ user_table::dsl::user_table.filter(user_table::dsl::id.eq(changeset.id.clone()));let _ = diesel::update(filter).set(changeset).execute(&*conn);// Send notification to the client@@ -338,17 +400,14 @@ impl UserSession {Ok(user.into())}- pub fn user_dir(&self) -> Result<String, FlowyError> {- let session = self.get_session()?;- Ok(format!(- "{}/{}",- self.session_config.root_dir, session.user_id- ))+ pub fn user_dir(&self, uid: i64) -> String {+ format!("{}/{}", self.session_config.root_dir, uid)}pub fn user_setting(&self) -> Result<UserSettingPB, FlowyError> {+ let session = self.get_session()?;let user_setting = UserSettingPB {- user_folder: self.user_dir()?,+ user_folder: self.user_dir(session.user_id),};Ok(user_setting)}@@ -365,15 +424,7 @@ impl UserSession {self.cloud_services.update_supabase_config(&config);let _ = KV::set_object(SUPABASE_CONFIG_CACHE_KEY, config);}-}-pub fn get_supabase_config() -> Option<SupabaseConfiguration> {- KV::get_str(SUPABASE_CONFIG_CACHE_KEY)- .and_then(|s| serde_json::from_str(&s).ok())- .unwrap_or_else(|| SupabaseConfiguration::from_env().ok())-}--impl UserSession {async fn update_user(&self,_auth_type: &AuthType,@@ -381,18 +432,14 @@ impl UserSession {token: Option<String>,params: UpdateUserProfileParams,) -> Result<(), FlowyError> {- let server = self.cloud_services.get_auth_service()?;+ let server = self.cloud_services.get_user_service()?;let token = token.to_owned();- let _ = tokio::spawn(async move {+ tokio::spawn(async move {let credentials = UserCredentials::new(token, Some(uid), None);- match server.update_user(credentials, params).await {- Ok(_) => {},- Err(e) => {- tracing::error!("update user profile failed: {:?}", e);- },- }+ server.update_user(credentials, params).await})- .await;+ .await+ .map_err(internal_error)??;Ok(())}@@ -400,7 +447,8 @@ impl UserSession {let conn = self.db_connection(uid)?;conn.immediate_transaction(|| {// delete old user if exists- diesel::delete(dsl::user_table.filter(dsl::id.eq(&user.id))).execute(&*conn)?;+ diesel::delete(user_table::dsl::user_table.filter(user_table::dsl::id.eq(&user.id)))+ .execute(&*conn)?;let _ = diesel::insert_into(user_table::table).values(user.clone())@@ -411,6 +459,77 @@ impl UserSession {Ok(user)}+ pub fn get_user_workspace(&self, uid: i64, workspace_id: &str) -> Option<UserWorkspace> {+ let conn = self.db_connection(uid).ok()?;+ let row = user_workspace_table::dsl::user_workspace_table+ .filter(user_workspace_table::id.eq(workspace_id))+ .first::<UserWorkspaceTable>(&*conn)+ .ok()?;+ Some(UserWorkspace::from(row))+ }++ pub fn get_all_user_workspaces(&self, uid: i64) -> FlowyResult<Vec<UserWorkspace>> {+ let conn = self.db_connection(uid)?;+ let rows = user_workspace_table::dsl::user_workspace_table+ .filter(user_workspace_table::uid.eq(uid))+ .load::<UserWorkspaceTable>(&*conn)?;++ if let Ok(service) = self.cloud_services.get_user_service() {+ if let Ok(pool) = self.db_pool(uid) {+ tokio::spawn(async move {+ if let Ok(new_user_workspaces) = service.get_user_workspaces(uid).await {+ let _ = save_user_workspaces(+ pool,+ new_user_workspaces+ .iter()+ .map(|user_workspace| UserWorkspaceTable::from((uid, user_workspace)))+ .collect(),+ );++ let repeated_workspace_pbs = RepeatedUserWorkspacePB::from(new_user_workspaces);+ send_notification(&uid.to_string(), UserNotification::DidUpdateUserWorkspaces)+ .payload(repeated_workspace_pbs)+ .send();+ }+ });+ }+ }+ Ok(rows.into_iter().map(UserWorkspace::from).collect())+ }++ pub async fn save_user_workspaces(+ &self,+ uid: i64,+ user_workspaces: Vec<UserWorkspaceTable>,+ ) -> FlowyResult<()> {+ let conn = self.db_connection(uid)?;+ conn.immediate_transaction(|| {+ for user_workspace in user_workspaces {+ if let Err(err) = diesel::update(+ user_workspace_table::dsl::user_workspace_table+ .filter(user_workspace_table::id.eq(user_workspace.id.clone())),+ )+ .set((+ user_workspace_table::name.eq(&user_workspace.name),+ user_workspace_table::created_at.eq(&user_workspace.created_at),+ user_workspace_table::database_storage_id.eq(&user_workspace.database_storage_id),+ ))+ .execute(&*conn)+ .and_then(|rows| {+ if rows == 0 {+ let _ = diesel::insert_into(user_workspace_table::table)+ .values(user_workspace)+ .execute(&*conn)?;+ }+ Ok(())+ }) {+ tracing::error!("Error saving user workspace: {:?}", err);+ }+ }+ Ok::<(), FlowyError>(())+ })+ }+fn set_session(&self, session: Option<Session>) -> Result<(), FlowyError> {tracing::debug!("Set user session: {:?}", session);match &session {@@ -423,6 +542,22 @@ impl UserSession {Ok(())}+ fn log_user(&self, uid: i64, storage_path: String) {+ let mut logger_users = KV::get_object::<HistoricalUsers>(HISTORICAL_USER).unwrap_or_default();+ logger_users.add_user(HistoricalUser {+ user_id: uid,+ sign_in_timestamp: timestamp(),+ storage_path,+ });+ let _ = KV::set_object(HISTORICAL_USER, logger_users);+ }++ pub fn get_historical_users(&self) -> Vec<HistoricalUser> {+ KV::get_object::<HistoricalUsers>(HISTORICAL_USER)+ .unwrap_or_default()+ .users+ }+/// Returns the current user session.pub fn get_session(&self) -> Result<Session, FlowyError> {match KV::get_object::<Session>(&self.session_config.session_cache_key) {@@ -433,82 +568,44 @@ impl UserSession {Some(session) => Ok(session),}}-- pub fn sign_in_history(&self) -> Vec<UserProfile> {- // match self.db_connection(uid) {- // Ok(conn) => match dsl::user_table.load::<UserTable>(&*conn) {- // Ok(users) => users.into_iter().map(|u| u.into()).collect(),- // Err(_) => vec![],- // },- // Err(e) => {- // tracing::error!("get user sign in history failed: {:?}", e);- // vec![]- // },- // }- vec![]- }}-#[derive(Debug, Clone, Default, Serialize, Deserialize)]-pub struct Session {- pub user_id: i64,- pub workspace_id: String,-}--impl std::convert::From<SignInResponse> for Session {- fn from(resp: SignInResponse) -> Self {- Session {- user_id: resp.user_id,- workspace_id: resp.workspace_id,- }- }+pub fn get_supabase_config() -> Option<SupabaseConfiguration> {+ KV::get_str(SUPABASE_CONFIG_CACHE_KEY)+ .and_then(|s| serde_json::from_str(&s).ok())+ .unwrap_or_else(|| SupabaseConfiguration::from_env().ok())}-impl std::convert::From<String> for Session {- fn from(s: String) -> Self {- match serde_json::from_str(&s) {- Ok(s) => s,- Err(e) => {- tracing::error!("Deserialize string to Session failed: {:?}", e);- Session::default()- },- }- }-}-impl std::convert::From<Session> for String {- fn from(session: Session) -> Self {- match serde_json::to_string(&session) {- Ok(s) => s,- Err(e) => {- tracing::error!("Serialize session to string failed: {:?}", e);- "".to_string()- },+pub fn save_user_workspaces(+ pool: Arc<ConnectionPool>,+ user_workspaces: Vec<UserWorkspaceTable>,+) -> FlowyResult<()> {+ let conn = pool.get()?;+ conn.immediate_transaction(|| {+ for user_workspace in user_workspaces {+ if let Err(err) = diesel::update(+ user_workspace_table::dsl::user_workspace_table+ .filter(user_workspace_table::id.eq(user_workspace.id.clone())),+ )+ .set((+ user_workspace_table::name.eq(&user_workspace.name),+ user_workspace_table::created_at.eq(&user_workspace.created_at),+ user_workspace_table::database_storage_id.eq(&user_workspace.database_storage_id),+ ))+ .execute(&*conn)+ .and_then(|rows| {+ if rows == 0 {+ let _ = diesel::insert_into(user_workspace_table::table)+ .values(user_workspace)+ .execute(&*conn)?;+ }+ Ok(())+ }) {+ tracing::error!("Error saving user workspace: {:?}", err);+ }}- }-}--#[derive(Debug, Clone, Hash, Serialize_repr, Deserialize_repr, Eq, PartialEq)]-#[repr(u8)]-pub enum AuthType {- /// It's a local server, we do fake sign in default.- Local = 0,- /// Currently not supported. It will be supported in the future when the- /// [AppFlowy-Server](https://github.com/AppFlowy-IO/AppFlowy-Server) ready.- SelfHosted = 1,- /// It uses Supabase as the backend.- Supabase = 2,-}--impl AuthType {- pub fn is_local(&self) -> bool {- matches!(self, AuthType::Local)- }-}--impl Default for AuthType {- fn default() -> Self {- Self::Local- }+ Ok::<(), FlowyError>(())+ })}impl From<AuthTypePB> for AuthType {@@ -531,33 +628,21 @@ impl From<AuthType> for AuthTypePB {}}-impl From<i32> for AuthType {- fn from(value: i32) -> Self {- match value {- 0 => AuthType::Local,- 1 => AuthType::SelfHosted,- 2 => AuthType::Supabase,- _ => AuthType::Local,- }- }-}--pub struct ThirdPartyParams {- pub uuid: Uuid,- pub email: String,+#[derive(Debug, Clone, Default, Serialize, Deserialize)]+pub struct HistoricalUsers {+ pub(crate) users: Vec<HistoricalUser>,}-pub fn uuid_from_box_any(any: BoxAny) -> Result<ThirdPartyParams, FlowyError> {- let map: HashMap<String, String> = any.unbox_or_error()?;- let uuid = uuid_from_map(&map)?;- let email = map.get("email").cloned().unwrap_or_default();- Ok(ThirdPartyParams { uuid, email })+impl HistoricalUsers {+ pub fn add_user(&mut self, new_user: HistoricalUser) {+ self.users.retain(|user| user.user_id != new_user.user_id);+ self.users.push(new_user);+ }}-pub fn uuid_from_map(map: &HashMap<String, String>) -> Result<Uuid, FlowyError> {- let uuid = map- .get("uuid")- .ok_or_else(|| FlowyError::new(ErrorCode::MissingAuthField, "Missing uuid field"))?- .as_str();- Uuid::from_str(uuid).map_err(internal_error)+#[derive(Debug, Clone, Default, Serialize, Deserialize)]+pub struct HistoricalUser {+ pub user_id: i64,+ pub sign_in_timestamp: i64,+ pub storage_path: String,}diff --git a/frontend/rust-lib/flowy-user/src/services/user_sql.rs b/frontend/rust-lib/flowy-user/src/services/user_sql.rsnew file mode 100644index 0000000000..02d208e1b3--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/services/user_sql.rs@@ -0,0 +1,107 @@+use flowy_sqlite::schema::user_table;+use flowy_user_deps::entities::*;++/// The order of the fields in the struct must be the same as the order of the fields in the table.+/// Check out the [schema.rs] for table schema.+#[derive(Clone, Default, Queryable, Identifiable, Insertable)]+#[table_name = "user_table"]+pub struct UserTable {+ pub(crate) id: String,+ pub(crate) name: String,+ pub(crate) workspace: String,+ pub(crate) icon_url: String,+ pub(crate) openai_key: String,+ pub(crate) token: String,+ pub(crate) email: String,+ pub(crate) auth_type: i32,+}++impl UserTable {+ pub fn set_workspace(mut self, workspace: String) -> Self {+ self.workspace = workspace;+ self+ }+}++impl From<(SignUpResponse, AuthType)> for UserTable {+ fn from(params: (SignUpResponse, AuthType)) -> Self {+ let resp = params.0;+ UserTable {+ id: resp.user_id.to_string(),+ name: resp.name,+ token: resp.token.unwrap_or_default(),+ email: resp.email.unwrap_or_default(),+ workspace: resp.latest_workspace.id,+ icon_url: "".to_string(),+ openai_key: "".to_string(),+ auth_type: params.1 as i32,+ }+ }+}++impl From<(SignInResponse, AuthType)> for UserTable {+ fn from(params: (SignInResponse, AuthType)) -> Self {+ let resp = params.0;+ let auth_type = params.1;+ UserTable {+ id: resp.user_id.to_string(),+ name: resp.name,+ token: resp.token.unwrap_or_default(),+ email: resp.email.unwrap_or_default(),+ workspace: resp.latest_workspace.id,+ icon_url: "".to_string(),+ openai_key: "".to_string(),+ auth_type: auth_type as i32,+ }+ }+}++impl From<UserTable> for UserProfile {+ fn from(table: UserTable) -> Self {+ UserProfile {+ id: table.id.parse::<i64>().unwrap_or(0),+ email: table.email,+ name: table.name,+ token: table.token,+ icon_url: table.icon_url,+ openai_key: table.openai_key,+ workspace_id: table.workspace,+ auth_type: AuthType::from(table.auth_type),+ }+ }+}++#[derive(AsChangeset, Identifiable, Default, Debug)]+#[table_name = "user_table"]+pub struct UserTableChangeset {+ pub id: String,+ pub workspace: Option<String>, // deprecated+ pub name: Option<String>,+ pub email: Option<String>,+ pub icon_url: Option<String>,+ pub openai_key: Option<String>,+}++impl UserTableChangeset {+ pub fn new(params: UpdateUserProfileParams) -> Self {+ UserTableChangeset {+ id: params.id.to_string(),+ workspace: None,+ name: params.name,+ email: params.email,+ icon_url: params.icon_url,+ openai_key: params.openai_key,+ }+ }++ pub fn from_user_profile(user_profile: UserProfile) -> Self {+ UserTableChangeset {+ id: user_profile.id.to_string(),+ workspace: None,+ name: Some(user_profile.name),+ email: Some(user_profile.email),+ icon_url: Some(user_profile.icon_url),+ openai_key: Some(user_profile.openai_key),+ }+ }+}diff --git a/frontend/rust-lib/flowy-user/src/services/user_workspace_sql.rs b/frontend/rust-lib/flowy-user/src/services/user_workspace_sql.rsnew file mode 100644index 0000000000..35a8614a9a--- /dev/null+++ b/frontend/rust-lib/flowy-user/src/services/user_workspace_sql.rs@@ -0,0 +1,40 @@+use chrono::{TimeZone, Utc};++use flowy_sqlite::schema::user_workspace_table;+use flowy_user_deps::entities::UserWorkspace;++#[derive(Clone, Default, Queryable, Identifiable, Insertable)]+#[table_name = "user_workspace_table"]+pub struct UserWorkspaceTable {+ pub id: String,+ pub name: String,+ pub uid: i64,+ pub created_at: i64,+ pub database_storage_id: String,+}++impl From<(i64, &UserWorkspace)> for UserWorkspaceTable {+ fn from(value: (i64, &UserWorkspace)) -> Self {+ Self {+ id: value.1.id.clone(),+ name: value.1.name.clone(),+ uid: value.0,+ created_at: value.1.created_at.timestamp(),+ database_storage_id: value.1.database_storage_id.clone(),+ }+ }+}++impl From<UserWorkspaceTable> for UserWorkspace {+ fn from(value: UserWorkspaceTable) -> Self {+ Self {+ id: value.id,+ name: value.name,+ created_at: Utc+ .timestamp_opt(value.created_at, 0)+ .single()+ .unwrap_or_default(),+ database_storage_id: "".to_string(),+ }+ }+}diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.tomlindex 15d419cd62..4f94ea8149 100644--- a/frontend/scripts/makefile/tests.toml+++ b/frontend/scripts/makefile/tests.toml@@ -39,12 +39,12 @@ flutter test --dart-define=RUST_LOG=${RUST_LOG} -j, --concurrency=1 --coverage[tasks.rust_unit_test]run_task = { name = ["rust_lib_unit_test", "shared_lib_unit_test"] }-[tasks.rust_cloud_unit_test]-env = { RUST_LOG = "debug" }+[tasks.supabase_unit_test]+env = { RUST_LOG = "info" }description = "Run cloud unit tests"script = '''cd rust-lib/flowy-test-RUST_BACKTRACE=1 cargo test cloud_test_ --features "cloud_test" -- --test-threads=1+RUST_BACKTRACE=1 cargo test supabase_ --features "cloud_test"'''[tasks.rust_lib_unit_test]