Skip to content

feat: 改进图片处理稳定性并添加富文本支持 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cyole merged 5 commits into from
Dec 10, 2025
Merged

feat: 改进图片处理稳定性并添加富文本支持 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e6d887
feat: 改进图片处理稳定性并添加富文本支持
cyole Dec 10, 2025
54f6fd6
fix: 改进图片同步稳定性并降低大小限制到5MB
cyole Dec 10, 2025
913900a
style: 代码格式化清理
cyole Dec 10, 2025
5db4773
fix: 修复服务器端图片重复广播问题
cyole Dec 10, 2025
bdc89cf
refactor: remove unnecessary whitespace in clipboard module
cyole Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 87 additions & 50 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ async fn run_server(addr: SocketAddr, relay_only: bool) -> Result<()> {
ClipboardContent::Image { width, height, .. } => {
println!("Received clipboard content from client: image ({}x{}), relaying to other clients...", width, height);
}
ClipboardContent::Html { html, .. } => {
println!("Received clipboard content from client: html ({} bytes), relaying to other clients...", html.len());
}
}
// 在只转发模式下，通过 broadcast 发送给其他客户端（保留 client_id）
if let Err(e) = broadcast_tx.send(message) {
Expand All @@ -91,7 +94,7 @@ async fn run_server(addr: SocketAddr, relay_only: bool) -> Result<()> {
tokio::try_join!(server_handle, receive_handle)?;
} else {
// 正常模式：访问剪贴板
let broadcast_for_clipboard = broadcast_tx.clone();
// 统一的剪贴板管理任务，避免重复广播
let clipboard_handle = tokio::spawn(async move {
let mut clipboard = match ClipboardMonitor::new() {
Ok(c) => c,
Expand All @@ -101,64 +104,86 @@ async fn run_server(addr: SocketAddr, relay_only: bool) -> Result<()> {
}
};

if let Err(e) = clipboard.monitor(move |content| {
match &content {
ClipboardContent::Text(text) => {
println!("Server clipboard changed: text ({} bytes), broadcasting to clients...", text.len());
}
ClipboardContent::Image { width, height, .. } => {
println!("Server clipboard changed: image ({}x{}), broadcasting to clients...", width, height);
let (local_tx, mut local_rx) = mpsc::unbounded_channel();

// 剪贴板监控任务
let monitor_handle = {
let local_tx = local_tx.clone();
tokio::spawn(async move {
loop {
tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
if let Err(e) = local_tx.send(()) {
eprintln!("Monitor channel closed: {}", e);
break;
}
}
}
let message = ClipboardMessage {
content: content.clone(),
timestamp: std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_secs(),
client_id: None, // 服务器本地的剪贴板变化没有 client_id
};
if let Err(e) = broadcast_for_clipboard.send(message) {
eprintln!("Failed to broadcast: {}", e);
}
Ok(())
}).await {
eprintln!("Clipboard monitor error: {}", e);
}
});

let receive_handle = tokio::spawn(async move {
let mut clipboard = match ClipboardMonitor::new() {
Ok(c) => c,
Err(e) => {
eprintln!("Failed to create clipboard monitor for receiving: {}", e);
return;
}
})
};

while let Some(message) = rx.recv().await {
match &message.content {
ClipboardContent::Text(text) => {
println!(
"Received clipboard content from client: text ({} bytes)",
text.len()
);
loop {
tokio::select! {
// 检查本地剪贴板变化
Some(_) = local_rx.recv() => {
if let Ok(Some(content)) = clipboard.get_clipboard_content() {
match &content {
ClipboardContent::Text(text) => {
println!("Server clipboard changed: text ({} bytes), broadcasting to clients...", text.len());
}
ClipboardContent::Image { width, height, .. } => {
println!("Server clipboard changed: image ({}x{}), broadcasting to clients...", width, height);
}
ClipboardContent::Html { html, .. } => {
println!("Server clipboard changed: html ({} bytes), broadcasting to clients...", html.len());
}
}
let message = ClipboardMessage {
content,
timestamp: std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_secs(),
client_id: None, // 服务器本地的剪贴板变化没有 client_id
};
if let Err(e) = broadcast_tx.send(message) {
eprintln!("Failed to broadcast: {}", e);
}
}
}
ClipboardContent::Image { width, height, .. } => {
println!(
"Received clipboard content from client: image ({}x{})",
width, height
);
// 接收来自客户端的消息
Some(message) = rx.recv() => {
match &message.content {
ClipboardContent::Text(text) => {
println!(
"Received clipboard content from client: text ({} bytes)",
text.len()
);
}
ClipboardContent::Image { width, height, .. } => {
println!(
"Received clipboard content from client: image ({}x{})",
width, height
);
}
ClipboardContent::Html { html, .. } => {
println!(
"Received clipboard content from client: html ({} bytes)",
html.len()
);
}
}
// 更新服务器剪贴板（会同时更新 hash）
if let Err(e) = clipboard.set_clipboard_content(&message.content) {
eprintln!("Failed to set server clipboard: {}", e);
}
}
}
// Update server's clipboard when receiving from client
if let Err(e) = clipboard.set_clipboard_content(&message.content) {
eprintln!("Failed to set server clipboard: {}", e);
else => break,
}
}

monitor_handle.abort();
});

tokio::try_join!(server_handle, clipboard_handle, receive_handle)?;
tokio::try_join!(server_handle, clipboard_handle)?;
}

Ok(())
Expand Down Expand Up @@ -254,6 +279,12 @@ async fn run_client(server_addr: SocketAddr, _listen_addr: SocketAddr) -> Result
width, height
);
}
ClipboardContent::Html { html, .. } => {
println!(
"Local clipboard changed, sending to server: html ({} bytes)",
html.len()
);
}
}
if let Err(e) = to_server_tx.send(content) {
eprintln!("Failed to send to server: {}", e);
Expand All @@ -280,6 +311,12 @@ async fn run_client(server_addr: SocketAddr, _listen_addr: SocketAddr) -> Result
width, height
);
}
ClipboardContent::Html { html, .. } => {
println!(
"Received clipboard from server: html ({} bytes)",
html.len()
);
}
}
// Update clipboard and hash together
if let Err(e) = clipboard.set_clipboard_content(&message.content) {
Expand Down
Loading