Feature/event (#513)

* improve code for notify

* fix

* cargo fmt

* improve code and create `DEFAULT_DELIMITER`

* fix

* fix

* improve code for notify

* fmt

* Update crates/notify/src/registry.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update crates/notify/src/factory.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix cllipy

* fix

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

rustfs/src/storage/ecfs.rs

@@ -16,9 +16,11 @@ use bytes::Bytes;
 use chrono::DateTime;
 use chrono::Utc;
 use datafusion::arrow::csv::WriterBuilder as CsvWriterBuilder;
-use datafusion::arrow::json::WriterBuilder as JsonWriterBuilder;
 use datafusion::arrow::json::writer::JsonArray;
+use datafusion::arrow::json::WriterBuilder as JsonWriterBuilder;
 
+// use ecstore::store_api::RESERVED_METADATA_PREFIX;
+use ecstore::bucket::lifecycle::bucket_lifecycle_ops::validate_transition_tier;
 use ecstore::bucket::metadata::BUCKET_LIFECYCLE_CONFIG;
 use ecstore::bucket::metadata::BUCKET_NOTIFICATION_CONFIG;
 use ecstore::bucket::metadata::BUCKET_POLICY_CONFIG;
@@ -33,13 +35,13 @@ use ecstore::bucket::tagging::decode_tags;
 use ecstore::bucket::tagging::encode_tags;
 use ecstore::bucket::utils::serialize;
 use ecstore::bucket::versioning_sys::BucketVersioningSys;
-use ecstore::cmd::bucket_replication::ReplicationStatusType;
-use ecstore::cmd::bucket_replication::ReplicationType;
 use ecstore::cmd::bucket_replication::get_must_replicate_options;
 use ecstore::cmd::bucket_replication::must_replicate;
 use ecstore::cmd::bucket_replication::schedule_replication;
-use ecstore::compress::MIN_COMPRESSIBLE_SIZE;
+use ecstore::cmd::bucket_replication::ReplicationStatusType;
+use ecstore::cmd::bucket_replication::ReplicationType;
 use ecstore::compress::is_compressible;
+use ecstore::compress::MIN_COMPRESSIBLE_SIZE;
 use ecstore::error::StorageError;
 use ecstore::new_object_layer_fn;
 use ecstore::set_disk::DEFAULT_READ_BUFFER_SIZE;
@@ -54,17 +56,15 @@ use ecstore::store_api::ObjectOptions;
 use ecstore::store_api::ObjectToDelete;
 use ecstore::store_api::PutObjReader;
 use ecstore::store_api::StorageAPI;
-// use ecstore::store_api::RESERVED_METADATA_PREFIX;
-use ecstore::bucket::lifecycle::bucket_lifecycle_ops::validate_transition_tier;
 use futures::StreamExt;
 use http::HeaderMap;
 use lazy_static::lazy_static;
 use policy::auth;
+use policy::policy::action::Action;
+use policy::policy::action::S3Action;
 use policy::policy::BucketPolicy;
 use policy::policy::BucketPolicyArgs;
 use policy::policy::Validator;
-use policy::policy::action::Action;
-use policy::policy::action::S3Action;
 use query::instance::make_rustfsms;
 use rustfs_filemeta::headers::RESERVED_METADATA_PREFIX_LOWER;
 use rustfs_filemeta::headers::{AMZ_DECODED_CONTENT_LENGTH, AMZ_OBJECT_TAGGING};
@@ -73,23 +73,23 @@ use rustfs_rio::EtagReader;
 use rustfs_rio::HashReader;
 use rustfs_rio::Reader;
 use rustfs_rio::WarpReader;
-use rustfs_utils::CompressionAlgorithm;
 use rustfs_utils::path::path_join_buf;
+use rustfs_utils::CompressionAlgorithm;
 use rustfs_zip::CompressionFormat;
-use s3s::S3;
+use s3s::dto::*;
+use s3s::s3_error;
 use s3s::S3Error;
 use s3s::S3ErrorCode;
 use s3s::S3Result;
-use s3s::dto::*;
-use s3s::s3_error;
+use s3s::S3;
 use s3s::{S3Request, S3Response};
 use std::collections::HashMap;
 use std::fmt::Debug;
 use std::path::Path;
 use std::str::FromStr;
 use std::sync::Arc;
-use time::OffsetDateTime;
 use time::format_description::well_known::Rfc3339;
+use time::OffsetDateTime;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 use tokio_tar::Archive;
@@ -102,6 +102,7 @@ use tracing::warn;
 use uuid::Uuid;
 
 use ecstore::bucket::lifecycle::lifecycle::Lifecycle;
+use rustfs_notify::EventName;
 
 macro_rules! try_ {
     ($result:expr) => {
@@ -224,25 +225,25 @@ impl FS {
 
                 // // store.put_object(bucket, object, data, opts);
 
-                // let output = PutObjectOutput {
-                //     e_tag,
-                //     ..Default::default()
-                // };
+                let output = PutObjectOutput {
+                    e_tag,
+                    ..Default::default()
+                };
 
-                // let event_args = rustfs_notify::event::EventArgs {
-                //     event_name: EventName::ObjectCreatedPut, // 或者其他相应的事件类型
-                //     bucket_name: bucket.clone(),
-                //     object: _obj_info.clone(), // clone() 或传递所需字段
-                //     req_params: crate::storage::global::extract_req_params(&req), // 假设有一个辅助函数来提取请求参数
-                //     resp_elements: crate::storage::global::extract_resp_elements(&output), // 假设有一个辅助函数来提取响应元素
-                //     host: crate::storage::global::get_request_host(&req.headers), // 假设的辅助函数
-                //     user_agent: crate::storage::global::get_request_user_agent(&req.headers), // 假设的辅助函数
-                // };
-                //
-                // // 异步调用，不会阻塞当前请求的响应
-                // tokio::spawn(async move {
-                //     rustfs_notify::notifier::GLOBAL_NOTIFIER.notify(event_args).await;
-                // });
+                let event_args = rustfs_notify::event::EventArgs {
+                    event_name: EventName::ObjectCreatedPut, // 或者其他相应的事件类型
+                    bucket_name: bucket.clone(),
+                    object: _obj_info.clone(), // clone() 或传递所需字段
+                    req_params: rustfs_utils::extract_req_params_header(&req.headers), // 假设有一个辅助函数来提取请求参数
+                    resp_elements: rustfs_utils::extract_resp_elements(&output), // 假设有一个辅助函数来提取响应元素
+                    host: rustfs_utils::get_request_host(&req.headers), // 假设的辅助函数
+                    user_agent: rustfs_utils::get_request_user_agent(&req.headers), // 假设的辅助函数
+                };
+
+                // 异步调用，不会阻塞当前请求的响应
+                tokio::spawn(async move {
+                    rustfs_notify::global::notifier_instance().notify(event_args).await;
+                });
             }
         }
 

rustfs/src/storage/global.rs

@@ -1,47 +0,0 @@
-use hyper::HeaderMap;
-use s3s::{S3Request, S3Response};
-use std::collections::HashMap;
-
-/// Extract request parameters from S3Request, mainly header information.
-#[allow(dead_code)]
-pub fn extract_req_params<T>(req: &S3Request<T>) -> HashMap<String, String> {
-    let mut params = HashMap::new();
-    for (key, value) in req.headers.iter() {
-        if let Ok(val_str) = value.to_str() {
-            params.insert(key.as_str().to_string(), val_str.to_string());
-        }
-    }
-    params
-}
-
-/// Extract response elements from S3Response, mainly header information.
-#[allow(dead_code)]
-pub fn extract_resp_elements<T>(resp: &S3Response<T>) -> HashMap<String, String> {
-    let mut params = HashMap::new();
-    for (key, value) in resp.headers.iter() {
-        if let Ok(val_str) = value.to_str() {
-            params.insert(key.as_str().to_string(), val_str.to_string());
-        }
-    }
-    params
-}
-
-/// Get host from header information.
-#[allow(dead_code)]
-pub fn get_request_host(headers: &HeaderMap) -> String {
-    headers
-        .get("host")
-        .and_then(|v| v.to_str().ok())
-        .unwrap_or_default()
-        .to_string()
-}
-
-/// Get user-agent from header information.
-#[allow(dead_code)]
-pub fn get_request_user_agent(headers: &HeaderMap) -> String {
-    headers
-        .get("user-agent")
-        .and_then(|v| v.to_str().ok())
-        .unwrap_or_default()
-        .to_string()
-}

rustfs/src/storage/mod.rs

@@ -1,5 +1,4 @@
 pub mod access;
 pub mod ecfs;
 // pub mod error;
-mod global;
 pub mod options;