Skip to content

fix(process): improve stdout encoding handling in read_line functions #1471 #3148

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

Open
Tunglies wants to merge 5 commits into
base: v2
Choose a base branch
from
+13 −1
Open

fix(process): improve stdout encoding handling in read_line functions #1471 #3148

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
fb94d47
fix(process): improve stdout encoding handling in read_line functions…
Tunglies Dec 5, 2025
6d65b39
fix(process): remove unnecessary encoding in read_raw_bytes function
Tunglies Dec 5, 2025
fd16c14
fix(process): streamline system encoding handling for cross-platform …
Tunglies Dec 5, 2025
2cf3cb5
fix(process): correct stdout encoding issue in readline handling
Tunglies Dec 5, 2025
f5858bf
fix(process): unify system encoding handling to compectiable with rus…
Tunglies Dec 5, 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
6 changes: 6 additions & 0 deletions .changes/fix-stdout-readline-encoding.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"shell": patch
"shell-js": patch
---

Fix incorrect stdout encoding when readline.
8 changes: 7 additions & 1 deletion plugins/shell/src/process/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ const NEWLINE_BYTE: u8 = b'\n';
use tauri::async_runtime::{block_on as block_on_task, channel, Receiver, Sender};

pub use encoding_rs::Encoding;
#[cfg(not(windows))]
use encoding_rs::UTF_8 as SYSTEM_ENCODING;
#[cfg(windows)]
use encoding_rs::WINDOWS_1252 as SYSTEM_ENCODING;
use os_pipe::{pipe, PipeReader, PipeWriter};
use serde::Serialize;
use shared_child::SharedChild;
Expand Down Expand Up @@ -435,8 +439,10 @@ fn read_line<F: Fn(Vec<u8>) -> CommandEvent + Send + Copy + 'static>(
if n == 0 {
break;
}
let (cow, _, _) = SYSTEM_ENCODING.decode(&buf);
let decode_bytes = cow.into_owned().into_bytes();
let tx_ = tx.clone();
let _ = block_on_task(async move { tx_.send(wrapper(buf)).await });
let _ = block_on_task(async move { tx_.send(wrapper(decode_bytes)).await });
}
Err(e) => {
let tx_ = tx.clone();
Expand Down
Loading