fix wanrings

backend/tests/document/helper.rs

@@ -1,5 +1,7 @@
+#![allow(clippy::all)]
+#![cfg_attr(rustfmt, rustfmt::skip)]
 use actix_web::web::Data;
-use backend::service::doc::{crud::update_doc, doc::DocManager};
+use backend::service::doc::{crud::update_doc, manager::DocManager};
 use backend_service::config::ServerConfig;
 use flowy_document::services::doc::ClientDocEditor as ClientEditDocContext;
 use flowy_test::{workspace::ViewTest, FlowyTest};

frontend/rust-lib/dart-ffi/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

frontend/rust-lib/dart-ffi/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod ffi_response;

frontend/rust-lib/dart-notify/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

frontend/rust-lib/dart-notify/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod subject;

frontend/rust-lib/flowy-document/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

frontend/rust-lib/flowy-document/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod observable;

frontend/rust-lib/flowy-sdk/src/lib.rs

@@ -4,7 +4,11 @@ pub mod module;
 use crate::deps_resolve::WorkspaceDepsResolver;
 use backend_service::config::ServerConfig;
 use flowy_document::module::FlowyDocument;
-use flowy_user::services::user::{UserSession, UserSessionBuilder, UserStatus};
+use flowy_user::{
+    notify::{NetworkState, NetworkType},
+    prelude::UserStatus,
+    services::user::{UserSession, UserSessionConfig},
+};
 use flowy_workspace::{errors::WorkspaceError, prelude::WorkspaceController};
 use lib_dispatch::prelude::*;
 use module::mk_modules;
@@ -73,11 +77,9 @@ impl FlowySDK {
         tracing::debug!("🔥 {:?}", config);
 
         let session_cache_key = format!("{}_session_cache", &config.name);
-        let user_session = Arc::new(
+
-            UserSessionBuilder::new()
+        let user_config = UserSessionConfig::new(&config.root, &config.server_config, &session_cache_key);
-                .root_dir(&config.root, &config.server_config, &session_cache_key)
+        let user_session = Arc::new(UserSession::new(user_config));
-                .build(),
-        );
         let flowy_document = mk_document_module(user_session.clone(), &config.server_config);
         let workspace_ctrl =
             mk_workspace_controller(user_session.clone(), flowy_document.clone(), &config.server_config);
@@ -98,10 +100,12 @@ impl FlowySDK {
 }
 
 fn _init(dispatch: &EventDispatcher, user_session: Arc<UserSession>, workspace_controller: Arc<WorkspaceController>) {
-    let subscribe = user_session.status_subscribe();
+    let user_status_subscribe = user_session.notifier.user_status_subscribe();
+    let network_status_subscribe = user_session.notifier.network_status_subscribe();
     dispatch.spawn(async move {
         user_session.init();
-        _listen_user_status(subscribe, workspace_controller).await;
+        _listen_user_status(user_status_subscribe, workspace_controller.clone()).await;
+        _listen_network_status(network_status_subscribe, workspace_controller).await;
     });
 }
 
@@ -109,31 +113,51 @@ async fn _listen_user_status(
     mut subscribe: broadcast::Receiver<UserStatus>,
     workspace_controller: Arc<WorkspaceController>,
 ) {
-    loop {
+    while let Ok(status) = subscribe.recv().await {
-        if let Ok(status) = subscribe.recv().await {
+        let result = || async {
-            let result = || async {
+            match status {
-                match status {
+                UserStatus::Login { token } => {
-                    UserStatus::Login { token } => {
+                    let _ = workspace_controller.user_did_sign_in(&token).await?;
-                        let _ = workspace_controller.user_did_sign_in(&token).await?;
+                },
-                    },
+                UserStatus::Logout { .. } => {
-                    UserStatus::Logout { .. } => {
+                    workspace_controller.user_did_logout().await;
-                        workspace_controller.user_did_logout().await;
+                },
-                    },
+                UserStatus::Expired { .. } => {
-                    UserStatus::Expired { .. } => {
+                    workspace_controller.user_session_expired().await;
-                        workspace_controller.user_session_expired().await;
+                },
-                    },
+                UserStatus::SignUp { profile, ret } => {
-                    UserStatus::SignUp { profile, ret } => {
+                    let _ = workspace_controller.user_did_sign_up(&profile.token).await?;
-                        let _ = workspace_controller.user_did_sign_up(&profile.token).await?;
+                    let _ = ret.send(());
-                        let _ = ret.send(());
+                },
-                    },
-                }
-                Ok::<(), WorkspaceError>(())
-            };
-
-            match result().await {
-                Ok(_) => {},
-                Err(e) => log::error!("{}", e),
             }
+            Ok::<(), WorkspaceError>(())
+        };
+
+        match result().await {
+            Ok(_) => {},
+            Err(e) => log::error!("{}", e),
+        }
+    }
+}
+
+async fn _listen_network_status(
+    mut subscribe: broadcast::Receiver<NetworkState>,
+    _workspace_controller: Arc<WorkspaceController>,
+) {
+    while let Ok(status) = subscribe.recv().await {
+        let result = || async {
+            match status.ty {
+                NetworkType::UnknownNetworkType => {},
+                NetworkType::Wifi => {},
+                NetworkType::Cell => {},
+                NetworkType::Ethernet => {},
+            }
+            Ok::<(), WorkspaceError>(())
+        };
+
+        match result().await {
+            Ok(_) => {},
+            Err(e) => log::error!("{}", e),
         }
     }
 }

frontend/rust-lib/flowy-user/src/entities/mod.rs

@@ -0,0 +1,4 @@
+mod status;
+
+pub use flowy_user_infra::entities::*;
+pub use status::*;

frontend/rust-lib/flowy-user/src/entities/status.rs

@@ -0,0 +1,19 @@
+use crate::entities::UserProfile;
+use tokio::sync::mpsc;
+
+#[derive(Clone)]
+pub enum UserStatus {
+    Login {
+        token: String,
+    },
+    Logout {
+        token: String,
+    },
+    Expired {
+        token: String,
+    },
+    SignUp {
+        profile: UserProfile,
+        ret: mpsc::Sender<()>,
+    },
+}

frontend/rust-lib/flowy-user/src/lib.rs

@@ -1,12 +1,12 @@
 mod handlers;
 mod sql_tables;
 
-pub use flowy_user_infra::entities;
 pub mod errors;
 
+pub mod entities;
 pub mod event;
 pub mod module;
-mod notify;
+pub mod notify;
 pub mod protobuf;
 pub mod services;
 

frontend/rust-lib/flowy-user/src/notify/mod.rs

@@ -1,2 +1,2 @@
 mod observable;
-pub(crate) use observable::*;
+pub use observable::*;

frontend/rust-lib/flowy-user/src/notify/observable.rs

@@ -1,6 +1,5 @@
-use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
-
 use dart_notify::DartNotifyBuilder;
+use flowy_derive::{ProtoBuf, ProtoBuf_Enum};
 
 const OBSERVABLE_CATEGORY: &str = "User";
 
@@ -25,7 +24,7 @@ pub(crate) fn dart_notify(id: &str, ty: UserNotification) -> DartNotifyBuilder {
     DartNotifyBuilder::new(id, ty, OBSERVABLE_CATEGORY)
 }
 
-#[derive(ProtoBuf_Enum, Debug)]
+#[derive(ProtoBuf_Enum, Debug, Clone)]
 pub enum NetworkType {
     UnknownNetworkType = 0,
     Wifi               = 1,
@@ -37,7 +36,7 @@ impl std::default::Default for NetworkType {
     fn default() -> Self { NetworkType::UnknownNetworkType }
 }
 
-#[derive(ProtoBuf, Debug, Default)]
+#[derive(ProtoBuf, Debug, Default, Clone)]
 pub struct NetworkState {
     #[pb(index = 1)]
     pub ty: NetworkType,

frontend/rust-lib/flowy-user/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

frontend/rust-lib/flowy-user/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod observable;

frontend/rust-lib/flowy-user/src/services/user/builder.rs

@@ -1,24 +0,0 @@
-use crate::services::user::{UserSession, UserSessionConfig};
-use backend_service::config::ServerConfig;
-
-pub struct UserSessionBuilder {
-    config: Option<UserSessionConfig>,
-}
-
-impl std::default::Default for UserSessionBuilder {
-    fn default() -> Self { Self { config: None } }
-}
-
-impl UserSessionBuilder {
-    pub fn new() -> Self { UserSessionBuilder::default() }
-
-    pub fn root_dir(mut self, dir: &str, server_config: &ServerConfig, session_cache_key: &str) -> Self {
-        self.config = Some(UserSessionConfig::new(dir, server_config, session_cache_key));
-        self
-    }
-
-    pub fn build(mut self) -> UserSession {
-        let config = self.config.take().unwrap();
-        UserSession::new(config)
-    }
-}

frontend/rust-lib/flowy-user/src/services/user/mod.rs

@@ -1,6 +1,5 @@
-pub use builder::*;
 pub use user_session::*;
 
-mod builder;
 pub mod database;
+mod notifier;
 mod user_session;

frontend/rust-lib/flowy-user/src/services/user/notifier.rs

@@ -0,0 +1,52 @@
+use crate::{
+    entities::{UserProfile, UserStatus},
+    notify::NetworkState,
+};
+use tokio::sync::{broadcast, mpsc};
+
+pub struct UserNotifier {
+    user_status_notifier: broadcast::Sender<UserStatus>,
+    network_status_notifier: broadcast::Sender<NetworkState>,
+}
+
+impl std::default::Default for UserNotifier {
+    fn default() -> Self {
+        let (user_status_notifier, _) = broadcast::channel(10);
+        let (network_status_notifier, _) = broadcast::channel(10);
+        UserNotifier {
+            user_status_notifier,
+            network_status_notifier,
+        }
+    }
+}
+
+impl UserNotifier {
+    pub(crate) fn new() -> Self { UserNotifier::default() }
+
+    pub(crate) fn notify_login(&self, token: &str) {
+        let _ = self.user_status_notifier.send(UserStatus::Login {
+            token: token.to_owned(),
+        });
+    }
+
+    pub(crate) fn notify_sign_up(&self, ret: mpsc::Sender<()>, user_profile: &UserProfile) {
+        let _ = self.user_status_notifier.send(UserStatus::SignUp {
+            profile: user_profile.clone(),
+            ret,
+        });
+    }
+
+    pub(crate) fn notify_logout(&self, token: &str) {
+        let _ = self.user_status_notifier.send(UserStatus::Logout {
+            token: token.to_owned(),
+        });
+    }
+
+    pub fn update_network_state(&self, state: NetworkState) { let _ = self.network_status_notifier.send(state); }
+
+    pub fn user_status_subscribe(&self) -> broadcast::Receiver<UserStatus> { self.user_status_notifier.subscribe() }
+
+    pub fn network_status_subscribe(&self) -> broadcast::Receiver<NetworkState> {
+        self.network_status_notifier.subscribe()
+    }
+}

frontend/rust-lib/flowy-user/src/services/user/user_session.rs

@@ -7,7 +7,10 @@ use crate::{
 
 use crate::{
     notify::*,
-    services::server::{construct_user_server, Server},
+    services::{
+        server::{construct_user_server, Server},
+        user::notifier::UserNotifier,
+    },
 };
 use backend_service::config::ServerConfig;
 use flowy_database::{
@@ -23,24 +26,7 @@ use lib_ws::{WsController, WsMessageHandler, WsState};
 use parking_lot::RwLock;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
-use tokio::sync::{broadcast, mpsc};
+use tokio::sync::mpsc;
-
-#[derive(Clone)]
-pub enum UserStatus {
-    Login {
-        token: String,
-    },
-    Logout {
-        token: String,
-    },
-    Expired {
-        token: String,
-    },
-    SignUp {
-        profile: UserProfile,
-        ret: mpsc::Sender<()>,
-    },
-}
 
 pub struct UserSessionConfig {
     root_dir: String,
@@ -65,7 +51,7 @@ pub struct UserSession {
     server: Server,
     session: RwLock<Option<Session>>,
     pub ws_controller: Arc<WsController>,
-    status_notifier: broadcast::Sender<UserStatus>,
+    pub notifier: UserNotifier,
 }
 
 impl UserSession {
@@ -73,25 +59,23 @@ impl UserSession {
         let db = UserDB::new(&config.root_dir);
         let server = construct_user_server(&config.server_config);
         let ws_controller = Arc::new(WsController::new());
-        let (status_notifier, _) = broadcast::channel(10);
+        let notifier = UserNotifier::new();
         Self {
             database: db,
             config,
             server,
             session: RwLock::new(None),
             ws_controller,
-            status_notifier,
+            notifier,
         }
     }
 
     pub fn init(&self) {
         if let Ok(session) = self.get_session() {
-            let _ = self.status_notifier.send(UserStatus::Login { token: session.token });
+            self.notifier.notify_login(&session.token);
         }
     }
 
-    pub fn status_subscribe(&self) -> broadcast::Receiver<UserStatus> { self.status_notifier.subscribe() }
-
     pub fn db_connection(&self) -> Result<DBConnection, UserError> {
         let user_id = self.get_session()?.user_id;
         self.database.get_connection(&user_id)
@@ -118,9 +102,7 @@ impl UserSession {
             let _ = self.set_session(Some(session))?;
             let user_table = self.save_user(resp.into()).await?;
             let user_profile: UserProfile = user_table.into();
-            let _ = self.status_notifier.send(UserStatus::Login {
+            self.notifier.notify_login(&user_profile.token);
-                token: user_profile.token.clone(),
-            });
             Ok(user_profile)
         }
     }
@@ -136,10 +118,7 @@ impl UserSession {
             let user_table = self.save_user(resp.into()).await?;
             let user_profile: UserProfile = user_table.into();
             let (ret, mut tx) = mpsc::channel(1);
-            let _ = self.status_notifier.send(UserStatus::SignUp {
+            self.notifier.notify_sign_up(ret, &user_profile);
-                profile: user_profile.clone(),
-                ret,
-            });
 
             let _ = tx.recv().await;
             Ok(user_profile)
@@ -153,9 +132,7 @@ impl UserSession {
             diesel::delete(dsl::user_table.filter(dsl::id.eq(&session.user_id))).execute(&*(self.db_connection()?))?;
         let _ = self.database.close_user_db(&session.user_id)?;
         let _ = self.set_session(None)?;
-        let _ = self.status_notifier.send(UserStatus::Logout {
+        self.notifier.notify_logout(&session.token);
-            token: session.token.clone(),
-        });
         let _ = self.sign_out_on_server(&session.token).await?;
 
         Ok(())

frontend/rust-lib/flowy-workspace/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

frontend/rust-lib/flowy-workspace/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod observable;

frontend/rust-lib/lib-infra/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

frontend/rust-lib/lib-infra/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod kv;

frontend/scripts/flowy-tool/src/proto/proto_gen.rs

@@ -53,6 +53,8 @@ fn write_rust_crate_mod_file(crate_infos: &[CrateProtoInfo]) {
         {
             Ok(ref mut file) => {
                 let mut mod_file_content = String::new();
+
+                mod_file_content.push_str("#![cfg_attr(rustfmt, rustfmt::skip)]\n");
                 mod_file_content.push_str("// Auto-generated, do not edit\n");
                 walk_dir(
                     crate_info.inner.proto_file_output_dir().as_ref(),

frontend/scripts/flowy-tool/src/proto/proto_info.rs

@@ -17,7 +17,8 @@ impl CrateProtoInfo {
         // mod model;
         // pub use model::*;
         let mod_file_path = format!("{}/mod.rs", self.inner.protobuf_crate_name());
-        let mut content = format!("// Auto-generated, do not edit\n");
+        let mut content = "#![cfg_attr(rustfmt, rustfmt::skip)]\n".to_owned();
+        content.push_str("// Auto-generated, do not edit\n");
         content.push_str("mod model;\npub use model::*;");
         match OpenOptions::new()
             .create(true)

frontend/scripts/flowy-tool/src/proto/template/derive_meta/derive_meta.tera

@@ -1,4 +1,4 @@
-#[rustfmt::skip]
+#![cfg_attr(rustfmt, rustfmt::skip)]
 pub enum TypeCategory {
     Array,
     Map,

shared-lib/flowy-derive/src/derive_cache/derive_cache.rs

@@ -1,4 +1,4 @@
-#[rustfmt::skip]
+#![cfg_attr(rustfmt, rustfmt::skip)]
 pub enum TypeCategory {
     Array,
     Map,

shared-lib/flowy-document-infra/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

shared-lib/flowy-document-infra/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod ws;

shared-lib/flowy-user-infra/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

shared-lib/flowy-user-infra/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod errors;

shared-lib/flowy-workspace-infra/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod view_update;

shared-lib/lib-ws/src/protobuf/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 mod model;
 pub use model::*;

shared-lib/lib-ws/src/protobuf/model/mod.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(rustfmt, rustfmt::skip)]
 // Auto-generated, do not edit
 
 mod errors;