Compteurs par niveau, barre de filtres collante et fenêtre de détail des entrées
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e44e0fd162
commit
981b28c058
5 files changed
+436
-47
No files matched your search
Generated
+10
-1
@@ -590,6 +590,12 @@ version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
||||
|
||||
[[package]]
|
||||
name = "foldhash"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.2.2"
|
||||
@@ -792,7 +798,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
|
||||
dependencies = [
|
||||
"allocator-api2",
|
||||
"equivalent",
|
||||
"foldhash",
|
||||
"foldhash 0.1.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1428,6 +1434,7 @@ dependencies = [
|
||||
"leptos_router",
|
||||
"regex",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sqlx",
|
||||
"tempfile",
|
||||
"time",
|
||||
@@ -2133,6 +2140,8 @@ version = "1.0.154"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
|
||||
dependencies = [
|
||||
"foldhash 0.2.0",
|
||||
"indexmap",
|
||||
"itoa",
|
||||
"memchr",
|
||||
"serde",
|
||||
|
||||
+3
-1
@@ -11,11 +11,13 @@ leptos = "0.8"
|
||||
leptos_meta = "0.8"
|
||||
leptos_router = "0.8"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
# Contexte JSON des entrées, affiché dans l'ordre des clés du log.
|
||||
serde_json = { version = "1", features = ["preserve_order"] }
|
||||
|
||||
# Client (WASM)
|
||||
console_error_panic_hook = { version = "0.1", optional = true }
|
||||
wasm-bindgen = { version = "0.2.106", optional = true }
|
||||
web-sys = { version = "0.3", features = ["Document", "VisibilityState"], optional = true }
|
||||
web-sys = { version = "0.3", features = ["Document", "Selection", "VisibilityState"], optional = true }
|
||||
|
||||
# Serveur uniquement
|
||||
axum = { version = "0.8", optional = true }
|
||||
|
||||
+11
-7
@@ -292,12 +292,13 @@ pub async fn read_entries(
|
||||
let has_more = entries.len() > limit;
|
||||
entries.truncate(limit);
|
||||
|
||||
let present: Vec<String> =
|
||||
sqlx::query_scalar("SELECT DISTINCT level FROM log_entries_index WHERE log_file_id = ?")
|
||||
.bind(file_id)
|
||||
.fetch_all(&pool)
|
||||
.await
|
||||
.map_err(internal_error)?;
|
||||
let present: Vec<(String, i64)> = sqlx::query_as(
|
||||
"SELECT level, COUNT(*) FROM log_entries_index WHERE log_file_id = ? GROUP BY level",
|
||||
)
|
||||
.bind(file_id)
|
||||
.fetch_all(&pool)
|
||||
.await
|
||||
.map_err(internal_error)?;
|
||||
|
||||
Ok(EntriesPage {
|
||||
file_id,
|
||||
@@ -307,7 +308,10 @@ pub async fn read_entries(
|
||||
has_more,
|
||||
scan_offset: scan_offset as u64,
|
||||
read_offset: read_offset as u64,
|
||||
levels: present,
|
||||
levels: present
|
||||
.into_iter()
|
||||
.map(|(level, count)| (level, count as u64))
|
||||
.collect(),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
+260
-36
@@ -4,9 +4,10 @@ use crate::{
|
||||
get_settings, read_entries, suggest_log_dirs, unread_summary,
|
||||
},
|
||||
model::{
|
||||
DEFAULT_REFRESH, EntriesPage, Entry, FaviconState, FileSort, FileSummary, LEVELS, LogKind,
|
||||
PAGE_SIZE, POLL_SECONDS, ProjectSummary, REFRESH_CHOICES, Settings, Summary, UNKNOWN_LEVEL,
|
||||
favicon_data_url, human_size, page_title, refresh_label, relative_age, sort_files,
|
||||
DEFAULT_REFRESH, EntriesPage, Entry, EntryPart, FaviconState, FileSort, FileSummary,
|
||||
LEVELS, LogKind, PAGE_SIZE, POLL_SECONDS, ProjectSummary, REFRESH_CHOICES, Settings,
|
||||
Summary, UNKNOWN_LEVEL, entry_parts, favicon_data_url, human_size, page_title,
|
||||
refresh_label, relative_age, sort_files,
|
||||
},
|
||||
};
|
||||
use leptos::{html, prelude::*};
|
||||
@@ -104,6 +105,23 @@ fn error_message(error: &ServerFnError) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// Vrai si du texte est sélectionné dans la page : un clic qui termine une sélection
|
||||
/// n'ouvre pas l'entrée.
|
||||
fn text_selected() -> bool {
|
||||
#[cfg(feature = "hydrate")]
|
||||
{
|
||||
window()
|
||||
.get_selection()
|
||||
.ok()
|
||||
.flatten()
|
||||
.is_some_and(|s| !s.is_collapsed())
|
||||
}
|
||||
#[cfg(not(feature = "hydrate"))]
|
||||
{
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
/// Vrai si l'onglet est affiché (toujours vrai côté serveur).
|
||||
fn page_visible() -> bool {
|
||||
#[cfg(feature = "hydrate")]
|
||||
@@ -1045,9 +1063,12 @@ fn FileView() -> impl IntoView {
|
||||
let query = RwSignal::new(String::new());
|
||||
// Curseur de lecture à l'ouverture du fichier : les entrées au-delà sont surlignées.
|
||||
let highlight_from = RwSignal::new(None::<(i64, u64)>);
|
||||
// Niveaux présents dans le fichier affiché. Tenu à part de la ressource : la barre de
|
||||
// filtres reste en place (et la recherche garde le focus) pendant les rafraîchissements.
|
||||
let present_levels = RwSignal::new(None::<(i64, Vec<String>)>);
|
||||
// Nombre d'entrées par niveau dans le fichier affiché. Tenu à part de la ressource : la
|
||||
// barre de filtres reste en place (et la recherche garde le focus) pendant les
|
||||
// rafraîchissements.
|
||||
let present_levels = RwSignal::new(None::<(i64, Vec<(String, u64)>)>);
|
||||
// Entrée affichée dans la fenêtre de détail. Copiée : les rafraîchissements ne la ferment pas.
|
||||
let selected = RwSignal::new(None::<Entry>);
|
||||
|
||||
Effect::watch(
|
||||
move || file_id.get(),
|
||||
@@ -1055,6 +1076,7 @@ fn FileView() -> impl IntoView {
|
||||
pages.set(1);
|
||||
levels.set(all_levels());
|
||||
query.set(String::new());
|
||||
selected.set(None);
|
||||
},
|
||||
false,
|
||||
);
|
||||
@@ -1123,21 +1145,30 @@ fn FileView() -> impl IntoView {
|
||||
};
|
||||
|
||||
view! {
|
||||
<div class="flex flex-col gap-4 p-6">
|
||||
<div class="flex flex-wrap items-center gap-3 text-sm">
|
||||
<div class="flex flex-col gap-4 px-6 pb-6">
|
||||
// Collée en haut de la zone de défilement : filtres et compteurs restent visibles.
|
||||
<div class="sticky top-0 z-10 -mx-6 flex flex-wrap items-center gap-3 border-b border-zinc-200 bg-zinc-50/95 px-6 py-3 text-sm backdrop-blur dark:border-zinc-800 dark:bg-zinc-950/95">
|
||||
{LEVELS
|
||||
.iter()
|
||||
.chain([&UNKNOWN_LEVEL])
|
||||
.map(|level| {
|
||||
let level: &'static str = level;
|
||||
// Disponible tant que le fichier courant n'est pas encore chargé.
|
||||
let available = move || {
|
||||
// Nombre d'entrées du niveau, `None` tant que le fichier courant n'est
|
||||
// pas encore chargé.
|
||||
let count = move || {
|
||||
present_levels
|
||||
.read()
|
||||
.as_ref()
|
||||
.filter(|(id, _)| Some(*id) == file_id.get())
|
||||
.is_none_or(|(_, present)| present.iter().any(|l| l == level))
|
||||
.map(|(_, present)| {
|
||||
present
|
||||
.iter()
|
||||
.find(|(l, _)| l == level)
|
||||
.map_or(0, |(_, n)| *n)
|
||||
})
|
||||
};
|
||||
// Disponible tant que le fichier courant n'est pas encore chargé.
|
||||
let available = move || count().is_none_or(|n| n > 0);
|
||||
view! {
|
||||
<label
|
||||
class=move || {
|
||||
@@ -1167,6 +1198,16 @@ fn FileView() -> impl IntoView {
|
||||
on:change=move |_| toggle_level(level)
|
||||
/>
|
||||
<span class=level_badge(level)>{level}</span>
|
||||
{move || {
|
||||
count()
|
||||
.map(|n| {
|
||||
view! {
|
||||
<span class="text-xs tabular-nums text-zinc-500">
|
||||
{n}
|
||||
</span>
|
||||
}
|
||||
})
|
||||
}}
|
||||
</label>
|
||||
}
|
||||
})
|
||||
@@ -1197,17 +1238,24 @@ fn FileView() -> impl IntoView {
|
||||
.get()
|
||||
.filter(|(id, _)| *id == page.file_id)
|
||||
.map(|(_, offset)| offset);
|
||||
view! { <EntriesList page highlight pages /> }.into_any()
|
||||
view! { <EntriesList page highlight pages selected /> }
|
||||
.into_any()
|
||||
}
|
||||
})
|
||||
}}
|
||||
</Transition>
|
||||
<EntryDialog selected />
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn EntriesList(page: EntriesPage, highlight: Option<u64>, pages: RwSignal<u32>) -> impl IntoView {
|
||||
fn EntriesList(
|
||||
page: EntriesPage,
|
||||
highlight: Option<u64>,
|
||||
pages: RwSignal<u32>,
|
||||
selected: RwSignal<Option<Entry>>,
|
||||
) -> impl IntoView {
|
||||
let empty = page.entries.is_empty();
|
||||
view! {
|
||||
<h1 class="text-lg font-semibold">
|
||||
@@ -1220,7 +1268,7 @@ fn EntriesList(page: EntriesPage, highlight: Option<u64>, pages: RwSignal<u32>)
|
||||
.into_iter()
|
||||
.map(|entry| {
|
||||
let new = highlight.is_some_and(|offset| entry.start >= offset);
|
||||
view! { <EntryRow entry new /> }
|
||||
view! { <EntryRow entry new selected /> }
|
||||
})
|
||||
.collect_view()}
|
||||
</ul>
|
||||
@@ -1253,34 +1301,58 @@ fn level_badge(level: &str) -> &'static str {
|
||||
}
|
||||
}
|
||||
|
||||
/// Une entrée dans la liste : son message, abrégé. Un clic l'ouvre dans la fenêtre de détail.
|
||||
#[component]
|
||||
fn EntryRow(entry: Entry, new: bool) -> impl IntoView {
|
||||
fn EntryRow(entry: Entry, new: bool, selected: RwSignal<Option<Entry>>) -> impl IntoView {
|
||||
let class = if new {
|
||||
"rounded-md border border-amber-300 bg-amber-50 p-3 dark:border-amber-700 dark:bg-amber-950"
|
||||
"cursor-pointer rounded-md border border-amber-300 bg-amber-50 p-3 hover:border-amber-400 focus:outline-none focus-visible:ring-2 focus-visible:ring-red-400 dark:border-amber-700 dark:bg-amber-950 dark:hover:border-amber-600"
|
||||
} else {
|
||||
"rounded-md border border-zinc-200 bg-white p-3 dark:border-zinc-800 dark:bg-zinc-900"
|
||||
"cursor-pointer rounded-md border border-zinc-200 bg-white p-3 hover:border-zinc-400 focus:outline-none focus-visible:ring-2 focus-visible:ring-red-400 dark:border-zinc-800 dark:bg-zinc-900 dark:hover:border-zinc-600"
|
||||
};
|
||||
let message_class = "font-mono text-sm whitespace-pre-wrap break-all";
|
||||
let body = if entry.details.is_empty() {
|
||||
view! { <p class=message_class>{entry.message}</p> }.into_any()
|
||||
} else {
|
||||
view! {
|
||||
<details>
|
||||
<summary class=format!("cursor-pointer {message_class}")>{entry.message}</summary>
|
||||
<pre class="mt-2 overflow-x-auto text-xs text-zinc-600 dark:text-zinc-400">{entry.details}</pre>
|
||||
</details>
|
||||
}
|
||||
.into_any()
|
||||
let more_lines = entry.details.lines().count();
|
||||
let header = view! {
|
||||
<div class="mb-1 flex items-center gap-2">
|
||||
<span class="font-mono text-xs text-zinc-500">{entry.logged_at.clone()}</span>
|
||||
<span class=level_badge(&entry.level)>{entry.level.clone()}</span>
|
||||
<span class="text-xs text-zinc-500">{entry.env.clone()}</span>
|
||||
{new.then(|| view! { <span class="text-xs font-semibold text-amber-600">"nouveau"</span> })}
|
||||
{(more_lines > 0)
|
||||
.then(|| {
|
||||
view! {
|
||||
<span class="ml-auto text-xs text-zinc-500">
|
||||
{match more_lines {
|
||||
1 => "+ 1 ligne".to_string(),
|
||||
n => format!("+ {n} lignes"),
|
||||
}}
|
||||
</span>
|
||||
}
|
||||
})}
|
||||
</div>
|
||||
<p class="line-clamp-2 font-mono text-sm break-all">{entry.message.clone()}</p>
|
||||
};
|
||||
let open = {
|
||||
let entry = entry.clone();
|
||||
move || selected.set(Some(entry.clone()))
|
||||
};
|
||||
let open_on_key = open.clone();
|
||||
view! {
|
||||
<li class=class>
|
||||
<div class="mb-1 flex items-center gap-2">
|
||||
<span class="font-mono text-xs text-zinc-500">{entry.logged_at}</span>
|
||||
<span class=level_badge(&entry.level)>{entry.level.clone()}</span>
|
||||
<span class="text-xs text-zinc-500">{entry.env}</span>
|
||||
{new.then(|| view! { <span class="text-xs font-semibold text-amber-600">"nouveau"</span> })}
|
||||
</div>
|
||||
{body}
|
||||
<li
|
||||
class=class
|
||||
tabindex="0"
|
||||
role="button"
|
||||
title="Afficher le détail"
|
||||
on:click=move |_| {
|
||||
if !text_selected() {
|
||||
open();
|
||||
}
|
||||
}
|
||||
on:keydown=move |ev| {
|
||||
if ev.key() == "Enter" {
|
||||
open_on_key();
|
||||
}
|
||||
}
|
||||
>
|
||||
{header}
|
||||
{entry
|
||||
.truncated
|
||||
.then(|| {
|
||||
@@ -1293,3 +1365,155 @@ fn EntryRow(entry: Entry, new: bool) -> impl IntoView {
|
||||
</li>
|
||||
}
|
||||
}
|
||||
|
||||
/// Fenêtre de détail d'une entrée (`<dialog>` natif, comme celle des projets) : le message,
|
||||
/// puis le contexte JSON présenté clé par clé et les lignes suivantes (trace…).
|
||||
#[component]
|
||||
fn EntryDialog(selected: RwSignal<Option<Entry>>) -> impl IntoView {
|
||||
let dialog = NodeRef::<html::Dialog>::new();
|
||||
Effect::new(move |_| {
|
||||
let Some(dialog) = dialog.get() else { return };
|
||||
match selected.get() {
|
||||
Some(_) if !dialog.open() => {
|
||||
let _ = dialog.show_modal();
|
||||
}
|
||||
None if dialog.open() => dialog.close(),
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
|
||||
view! {
|
||||
<dialog
|
||||
node_ref=dialog
|
||||
aria-labelledby="entry-dialog-title"
|
||||
class="m-auto w-full max-w-5xl rounded-lg bg-white text-zinc-900 shadow-xl backdrop:bg-black/60 dark:bg-zinc-900 dark:text-zinc-100"
|
||||
on:close=move |_| selected.set(None)
|
||||
on:click=move |ev| {
|
||||
if dialog.get().is_some_and(|d| ev.target() == Some(d.into())) {
|
||||
selected.set(None);
|
||||
}
|
||||
}
|
||||
>
|
||||
{move || selected.get().map(|entry| view! { <EntryDetail entry selected /> })}
|
||||
</dialog>
|
||||
}
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn EntryDetail(entry: Entry, selected: RwSignal<Option<Entry>>) -> impl IntoView {
|
||||
let text = if entry.details.is_empty() {
|
||||
entry.message
|
||||
} else {
|
||||
format!("{}\n{}", entry.message, entry.details)
|
||||
};
|
||||
let mut json_count = 0;
|
||||
let parts = entry_parts(&text)
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
.map(|(i, part)| match part {
|
||||
// Le premier texte est le message : mis en avant.
|
||||
EntryPart::Text(text) if i == 0 => view! {
|
||||
<p id="entry-dialog-title" class="font-mono text-base leading-relaxed whitespace-pre-wrap break-words">
|
||||
{text}
|
||||
</p>
|
||||
}
|
||||
.into_any(),
|
||||
EntryPart::Text(text) => view! {
|
||||
<pre class="overflow-x-auto rounded-md bg-zinc-50 p-3 text-xs leading-relaxed text-zinc-700 dark:bg-zinc-950 dark:text-zinc-300">
|
||||
{text}
|
||||
</pre>
|
||||
}
|
||||
.into_any(),
|
||||
EntryPart::Json(value) => {
|
||||
// Monolog écrit le contexte, puis les données supplémentaires.
|
||||
let label = match json_count {
|
||||
0 => "Contexte",
|
||||
1 => "Extra",
|
||||
_ => "Données",
|
||||
};
|
||||
json_count += 1;
|
||||
view! {
|
||||
<section class="flex flex-col gap-2">
|
||||
<h3 class="text-xs font-semibold uppercase tracking-wide text-zinc-500">
|
||||
{label}
|
||||
</h3>
|
||||
<div class="rounded-md bg-zinc-50 p-3 text-sm dark:bg-zinc-950">
|
||||
{json_view(value)}
|
||||
</div>
|
||||
</section>
|
||||
}
|
||||
.into_any()
|
||||
}
|
||||
})
|
||||
.collect_view();
|
||||
view! {
|
||||
<div class="flex max-h-[85vh] flex-col">
|
||||
<header class="flex items-center gap-2 border-b border-zinc-200 px-5 py-3 dark:border-zinc-800">
|
||||
<span class="font-mono text-sm text-zinc-500">{entry.logged_at}</span>
|
||||
<span class=level_badge(&entry.level)>{entry.level.clone()}</span>
|
||||
<span class="text-sm text-zinc-500">{entry.env}</span>
|
||||
<button
|
||||
type="button"
|
||||
class="ml-auto rounded px-2 py-0.5 text-lg leading-none text-zinc-500 hover:bg-zinc-100 hover:text-zinc-900 dark:hover:bg-zinc-800 dark:hover:text-zinc-100"
|
||||
aria-label="Fermer"
|
||||
on:click=move |_| selected.set(None)
|
||||
>
|
||||
"×"
|
||||
</button>
|
||||
</header>
|
||||
<div class="flex flex-col gap-5 overflow-y-auto p-5">
|
||||
{parts}
|
||||
{entry
|
||||
.truncated
|
||||
.then(|| {
|
||||
view! {
|
||||
<p class="text-xs text-amber-700">
|
||||
{format!("Entrée tronquée ({}).", human_size(entry.size))}
|
||||
</p>
|
||||
}
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
/// Valeur JSON présentée en arbre : une clé par ligne, les objets imbriqués en retrait, les
|
||||
/// chaînes sur plusieurs lignes (trace d'exception) avec leurs vrais sauts de ligne.
|
||||
fn json_view(value: serde_json::Value) -> AnyView {
|
||||
use serde_json::Value;
|
||||
match value {
|
||||
Value::Object(map) if !map.is_empty() => view! {
|
||||
<dl class="grid grid-cols-[max-content_minmax(0,1fr)] gap-x-4 gap-y-1.5">
|
||||
{map
|
||||
.into_iter()
|
||||
.map(|(key, value)| {
|
||||
view! {
|
||||
<dt class="font-mono text-zinc-500">{key}</dt>
|
||||
<dd class="min-w-0">{json_view(value)}</dd>
|
||||
}
|
||||
})
|
||||
.collect_view()}
|
||||
</dl>
|
||||
}
|
||||
.into_any(),
|
||||
Value::Array(items) if !items.is_empty() => view! {
|
||||
<ol class="flex flex-col gap-1.5 border-l-2 border-zinc-200 pl-3 dark:border-zinc-700">
|
||||
{items
|
||||
.into_iter()
|
||||
.map(|item| view! { <li class="min-w-0">{json_view(item)}</li> })
|
||||
.collect_view()}
|
||||
</ol>
|
||||
}
|
||||
.into_any(),
|
||||
Value::Object(_) => view! { <span class="font-mono text-zinc-400">"{}"</span> }.into_any(),
|
||||
Value::Array(_) => view! { <span class="font-mono text-zinc-400">"[]"</span> }.into_any(),
|
||||
Value::String(s) if s.contains('\n') => view! {
|
||||
<pre class="overflow-x-auto text-xs leading-relaxed text-zinc-700 dark:text-zinc-300">{s}</pre>
|
||||
}
|
||||
.into_any(),
|
||||
Value::String(s) => view! { <span class="font-mono break-all">{s}</span> }.into_any(),
|
||||
Value::Null => view! { <span class="font-mono text-zinc-400 italic">"null"</span> }.into_any(),
|
||||
other => view! { <span class="font-mono text-sky-700 dark:text-sky-400">{other.to_string()}</span> }
|
||||
.into_any(),
|
||||
}
|
||||
}
|
||||
+152
-2
@@ -189,8 +189,8 @@ pub struct EntriesPage {
|
||||
pub scan_offset: u64,
|
||||
/// Curseur de lecture au moment de l'appel.
|
||||
pub read_offset: u64,
|
||||
/// Niveaux présents dans le fichier, indépendamment des filtres.
|
||||
pub levels: Vec<String>,
|
||||
/// Nombre d'entrées de chaque niveau présent dans le fichier, indépendamment des filtres.
|
||||
pub levels: Vec<(String, u64)>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
@@ -392,6 +392,118 @@ pub fn human_size(bytes: u64) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// Morceau d'une entrée affichée en détail : du texte, ou une valeur JSON (contexte et extra
|
||||
/// de Monolog, écrits à la suite du message).
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub enum EntryPart {
|
||||
Text(String),
|
||||
Json(serde_json::Value),
|
||||
}
|
||||
|
||||
/// Découpe le texte complet d'une entrée en texte et valeurs JSON. Une valeur commence en
|
||||
/// début de texte ou après un blanc ; un tableau n'est retenu que s'il n'est suivi d'aucun
|
||||
/// texte, ailleurs c'est presque toujours du texte (`SQLSTATE[HY000] [1045]`). Les valeurs
|
||||
/// vides (`[]`, `{}`) sont omises.
|
||||
pub fn entry_parts(text: &str) -> Vec<EntryPart> {
|
||||
// (début, fin, valeur) des valeurs JSON trouvées, dans l'ordre.
|
||||
let mut found: Vec<(usize, usize, serde_json::Value)> = Vec::new();
|
||||
let bytes = text.as_bytes();
|
||||
let mut i = 0;
|
||||
while i < bytes.len() {
|
||||
let boundary = i == 0 || bytes[i - 1].is_ascii_whitespace();
|
||||
if boundary
|
||||
&& matches!(bytes[i], b'{' | b'[')
|
||||
&& let Some((len, value)) = parse_json_at(&text[i..])
|
||||
{
|
||||
found.push((i, i + len, value));
|
||||
i += len;
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
// Un tableau suivi de texte redevient du texte.
|
||||
let mut kept: Vec<(usize, usize, serde_json::Value)> = Vec::new();
|
||||
let mut text_after = false;
|
||||
for (start, end, value) in found.into_iter().rev() {
|
||||
let next = kept.last().map_or(text.len(), |(start, _, _)| *start);
|
||||
text_after = text_after || !text[end..next].trim().is_empty();
|
||||
if value.is_array() && text_after {
|
||||
continue;
|
||||
}
|
||||
kept.push((start, end, value));
|
||||
}
|
||||
kept.reverse();
|
||||
|
||||
let mut parts = Vec::new();
|
||||
let push_text = |parts: &mut Vec<EntryPart>, s: &str| {
|
||||
let s = s.trim_matches(|c: char| c.is_whitespace());
|
||||
if !s.is_empty() {
|
||||
parts.push(EntryPart::Text(s.to_string()));
|
||||
}
|
||||
};
|
||||
let mut from = 0;
|
||||
for (start, end, value) in kept {
|
||||
push_text(&mut parts, &text[from..start]);
|
||||
let empty = match &value {
|
||||
serde_json::Value::Array(a) => a.is_empty(),
|
||||
serde_json::Value::Object(o) => o.is_empty(),
|
||||
_ => false,
|
||||
};
|
||||
if !empty {
|
||||
parts.push(EntryPart::Json(value));
|
||||
}
|
||||
from = end;
|
||||
}
|
||||
push_text(&mut parts, &text[from..]);
|
||||
parts
|
||||
}
|
||||
|
||||
/// Valeur JSON au début de `s` (un objet ou un tableau) et sa longueur en octets. Les sauts
|
||||
/// de ligne bruts dans les chaînes sont acceptés : Monolog y écrit tels quels ceux des traces
|
||||
/// d'exception.
|
||||
fn parse_json_at(s: &str) -> Option<(usize, serde_json::Value)> {
|
||||
let mut depth = 0usize;
|
||||
let mut in_string = false;
|
||||
let mut escaped = false;
|
||||
let mut clean = String::new();
|
||||
for (i, c) in s.char_indices() {
|
||||
if in_string {
|
||||
match c {
|
||||
_ if escaped => escaped = false,
|
||||
'\\' => escaped = true,
|
||||
'"' => in_string = false,
|
||||
'\n' => {
|
||||
clean.push_str("\\n");
|
||||
continue;
|
||||
}
|
||||
'\r' => continue,
|
||||
'\t' => {
|
||||
clean.push_str("\\t");
|
||||
continue;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
} else {
|
||||
match c {
|
||||
'"' => in_string = true,
|
||||
'{' | '[' => depth += 1,
|
||||
'}' | ']' => {
|
||||
depth -= 1;
|
||||
if depth == 0 {
|
||||
clean.push(c);
|
||||
return serde_json::from_str(&clean)
|
||||
.ok()
|
||||
.map(|value| (i + 1, value));
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
clean.push(c);
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -517,4 +629,42 @@ mod tests {
|
||||
assert_eq!(page_title(0), "Logs Reader");
|
||||
assert_eq!(page_title(150), "(150) Logs Reader");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn entry_parts_monolog_context() {
|
||||
use serde_json::json;
|
||||
let parts = entry_parts(r#"user simulate {"email":"a@b.c","of":"R1"} []"#);
|
||||
assert_eq!(
|
||||
parts,
|
||||
vec![
|
||||
EntryPart::Text("user simulate".into()),
|
||||
EntryPart::Json(json!({"email": "a@b.c", "of": "R1"})),
|
||||
]
|
||||
);
|
||||
// Crochets dans le message : du texte.
|
||||
let text = "SQLSTATE[HY000] [1045] Access denied (Connection: mysql) {\"exception\":\"[object] (PDOException(code: 1045) at /a.php:70)\n[stacktrace]\n#0 {main}\n\"} ";
|
||||
let parts = entry_parts(text);
|
||||
assert_eq!(parts.len(), 2);
|
||||
assert_eq!(
|
||||
parts[0],
|
||||
EntryPart::Text("SQLSTATE[HY000] [1045] Access denied (Connection: mysql)".into())
|
||||
);
|
||||
let EntryPart::Json(value) = &parts[1] else {
|
||||
panic!("contexte attendu")
|
||||
};
|
||||
assert!(
|
||||
value["exception"]
|
||||
.as_str()
|
||||
.unwrap()
|
||||
.ends_with("#0 {main}\n")
|
||||
);
|
||||
assert_eq!(
|
||||
entry_parts("liste [1, 2] puis texte"),
|
||||
vec![EntryPart::Text("liste [1, 2] puis texte".into())]
|
||||
);
|
||||
assert_eq!(
|
||||
entry_parts("{main} et {pas json"),
|
||||
vec![EntryPart::Text("{main} et {pas json".into())]
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user