feat: add subscription management and graceful shutdown support (v0.3.6)

- Add SubscriptionHandle for managing stream lifecycle
- Implement graceful shutdown with stop() methods
- Update documentation with new features
- Bump version to 0.3.6
This commit is contained in:
ysq
2025-08-21 15:47:31 +08:00
parent 372bb765af
commit 9ec7194d2a
10 changed files with 238 additions and 68 deletions
+55 -40
View File
@@ -1,7 +1,7 @@
use solana_sdk::pubkey::Pubkey;
use crate::common::AnyResult;
use crate::streaming::common::EventBatchProcessor;
use crate::streaming::common::{EventBatchProcessor, SubscriptionHandle};
use crate::streaming::event_parser::common::filter::EventTypeFilter;
use crate::streaming::event_parser::{Protocol, UnifiedEvent};
use crate::streaming::shred::{ShredEventProcessor, ShredStreamHandler, TransactionWithSlot};
@@ -20,27 +20,38 @@ impl ShredStreamGrpc {
where
F: Fn(Box<dyn UnifiedEvent>) + Send + Sync + 'static,
{
// 如果已有活跃订阅,先停止它
self.stop().await;
let mut metrics_handle = None;
// 启动自动性能监控(如果启用)
if self.config.enable_metrics {
self.metrics_manager.start_auto_monitoring().await;
metrics_handle = self.metrics_manager.start_auto_monitoring().await;
}
// 启动流处理
let client = (*self.shredstream_client).clone();
let (_stream_task, rx) = ShredStreamHandler::start_stream_processing(
let (stream_task, rx) = ShredStreamHandler::start_stream_processing(
client,
self.config.backpressure.channel_size,
)
.await?;
// 根据配置选择处理模式
if self.config.batch.enabled {
// 根据配置选择处理模式并获取事件处理任务句柄
let event_handle = if self.config.batch.enabled {
// 批处理模式
self.process_with_batch(rx, protocols, bot_wallet, event_type_filter, callback).await
self.process_with_batch(rx, protocols, bot_wallet, event_type_filter, callback).await?
} else {
// 即时处理模式
self.process_immediate(rx, protocols, bot_wallet, event_type_filter, callback).await
}
self.process_immediate(rx, protocols, bot_wallet, event_type_filter, callback).await?
};
// 保存订阅句柄
let subscription_handle = SubscriptionHandle::new(stream_task, event_handle, metrics_handle);
let mut handle_guard = self.subscription_handle.lock().await;
*handle_guard = Some(subscription_handle);
Ok(())
}
/// 批处理模式
@@ -51,7 +62,7 @@ impl ShredStreamGrpc {
bot_wallet: Option<Pubkey>,
event_type_filter: Option<EventTypeFilter>,
callback: F,
) -> AnyResult<()>
) -> AnyResult<tokio::task::JoinHandle<()>>
where
F: Fn(Box<dyn UnifiedEvent>) + Send + Sync + 'static,
{
@@ -74,25 +85,27 @@ impl ShredStreamGrpc {
let event_processor =
ShredEventProcessor::new(self.metrics_manager.clone(), self.config.clone());
while let Some(transaction_with_slot) = rx.next().await {
if let Err(e) = event_processor
.process_transaction_with_batch(
transaction_with_slot,
protocols.clone(),
bot_wallet,
&mut batch_processor,
event_type_filter.clone(),
)
.await
{
log::error!("Error processing transaction: {e:?}");
let event_handle = tokio::spawn(async move {
while let Some(transaction_with_slot) = rx.next().await {
if let Err(e) = event_processor
.process_transaction_with_batch(
transaction_with_slot,
protocols.clone(),
bot_wallet,
&mut batch_processor,
event_type_filter.clone(),
)
.await
{
log::error!("Error processing transaction: {e:?}");
}
}
}
// 处理剩余的事件
batch_processor.flush();
// 处理剩余的事件
batch_processor.flush();
});
Ok(())
Ok(event_handle)
}
/// 即时处理模式
@@ -103,7 +116,7 @@ impl ShredStreamGrpc {
bot_wallet: Option<Pubkey>,
event_type_filter: Option<EventTypeFilter>,
callback: F,
) -> AnyResult<()>
) -> AnyResult<tokio::task::JoinHandle<()>>
where
F: Fn(Box<dyn UnifiedEvent>) + Send + Sync + 'static,
{
@@ -113,21 +126,23 @@ impl ShredStreamGrpc {
let event_processor =
ShredEventProcessor::new(self.metrics_manager.clone(), self.config.clone());
while let Some(transaction_with_slot) = rx.next().await {
if let Err(e) = event_processor
.process_transaction_immediate(
transaction_with_slot,
protocols.clone(),
bot_wallet,
event_type_filter.clone(),
&callback,
)
.await
{
log::error!("Error processing transaction: {e:?}");
let event_handle = tokio::spawn(async move {
while let Some(transaction_with_slot) = rx.next().await {
if let Err(e) = event_processor
.process_transaction_immediate(
transaction_with_slot,
protocols.clone(),
bot_wallet,
event_type_filter.clone(),
&callback,
)
.await
{
log::error!("Error processing transaction: {e:?}");
}
}
}
});
Ok(())
Ok(event_handle)
}
}