Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-05-17 10:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: search accumulated log buffer for server readiness line

Browse source 
The stdout reader matched 'EngineFS server started at' against
string_data (the bytes from the most recent read only). If server.js
flushed in such a way that the readiness line straddled two reads,
neither chunk's .lines() yielded a full match, the endpoint channel
never received, recv() timed out, and the WebUI loaded against the
fallback URL.

Search the accumulated *lines buffer instead so a line split across
reads matches once the second chunk lands. Track endpoint_sent so we
do not resend on every subsequent chunk after a match.

Also preserve trailing newlines when trimming the retained buffer to
SRV_LOG_SIZE lines so a later chunk cannot be concatenated onto the
last unterminated line and corrupt a parser. Same trim treatment for
the stderr reader for consistency.

Closes #53
This commit is contained in:
Claude 2026-05-10 12:36:37 +00:00
parent 1464d46172
commit 51d75cfe6e
No known key found for this signature in database
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/stremio_app/stremio_server/server.rs
View file

@ -104,7 +104,7 @@ impl StremioServer {
let out_lines = lines.clone(); let out_lines = lines.clone();
let tx = tx.clone(); let tx = tx.clone();
let out_thread = thread::spawn(move || { let out_thread = thread::spawn(move || {
let http_endpoint = String::new(); let mut endpoint_sent = false;
loop { loop {
let mut buffer = [0; SRV_BUFFER_SIZE]; let mut buffer = [0; SRV_BUFFER_SIZE];
let on = match stdout.read(&mut buffer[..]) { let on = match stdout.read(&mut buffer[..]) {
@ -120,19 +120,21 @@ impl StremioServer {
{ {
let lines = &mut *out_lines.lock().unwrap(); let lines = &mut *out_lines.lock().unwrap();
*lines += string_data.deref(); *lines += string_data.deref();
if http_endpoint.is_empty() { if !endpoint_sent {
if let Some(http_endpoint) = string_data if let Some(line) = lines
.lines() .lines()
.find(|line| line.starts_with("EngineFS server started at")) .find(|line| line.starts_with("EngineFS server started at"))
{ {
let http_endpoint = if let Some(endpoint) = line.split_whitespace().last() {
http_endpoint.split_whitespace().last().unwrap(); println!("HTTP endpoint: {endpoint}");
println!("HTTP endpoint: {http_endpoint}"); tx.send(endpoint.to_string()).ok();
let endpoint = http_endpoint.to_string(); endpoint_sent = true;
tx.send(endpoint.clone()).ok(); }
} }
} }
*lines = lines // Preserve trailing newline so the next chunk can't glue onto an unterminated line.
let had_trailing_newline = lines.ends_with('\n');
let mut trimmed = lines
.lines() .lines()
.rev() .rev()
.take(SRV_LOG_SIZE) .take(SRV_LOG_SIZE)
@ -141,6 +143,10 @@ impl StremioServer {
.rev() .rev()
.collect::<Vec<&str>>() .collect::<Vec<&str>>()
.join("\n"); .join("\n");
if had_trailing_newline {
trimmed.push('\n');
}
*lines = trimmed;
}; };
} }
}); });
@ -164,7 +170,8 @@ impl StremioServer {
{ {
let lines = &mut *err_lines.lock().unwrap(); let lines = &mut *err_lines.lock().unwrap();
*lines += string_data.deref(); *lines += string_data.deref();
*lines = lines let had_trailing_newline = lines.ends_with('\n');
let mut trimmed = lines
.lines() .lines()
.rev() .rev()
.take(SRV_LOG_SIZE) .take(SRV_LOG_SIZE)
@ -173,6 +180,10 @@ impl StremioServer {
.rev() .rev()
.collect::<Vec<&str>>() .collect::<Vec<&str>>()
.join("\n"); .join("\n");
if had_trailing_newline {
trimmed.push('\n');
}
*lines = trimmed;
}; };
} }
}); });