diff options
| author | Stefan Boberg <[email protected]> | 2026-05-05 15:47:48 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-05-05 15:47:48 +0200 |
| commit | 01286c6233347d561064fc9e6cf9deaf2087ceb7 (patch) | |
| tree | bdbfdf01725baa2d2dd3d73727e6506b41421dff /src/zenserver/frontend/html/zen.css | |
| parent | hub async s3 client (#1024) (diff) | |
| download | archived-zen-main.tar.xz archived-zen-main.zip | |
Branch started as a sessions-service overhaul (persistence, client liveness, UE_LOGFMT intake) and grew to pick up adjacent infrastructure work: an early-startup log backlog, a hardened `MemoryArena`, the `zen trace serve` viewer gaining a counter view + compact timeline + tabbed callsite panel, defensive fixes in the third-party `tourist` trace parser, a series of allocation reductions across the HTTP and compact-binary hot paths, and a new `zen sessions` CLI command tree.
## Sessions service
**Persistence.** Each session lives on disk under `<DataRoot>/sessions/<id>/` as `info.cb` (metadata) plus `log.bin` (length-prefixed CbObject log records). On startup the service scans that directory and loads prior sessions as ended sessions, preloading the tail of each log so historical views work after a restart. `SessionLog` is noexcept-constructed and falls back to a disabled state on disk errors, so a bad disk can't take down `RegisterSession`. `GetSession` falls back to the ended-sessions list (fixes historical log fetches over HTTP). `LoadTail` counts only successfully-parsed records.
**Pruning.** Periodic cleanup task drops ended sessions once any of three caps is exceeded: age (default 1 year), count (default 1000), or total on-disk footprint (default 50 MiB). Runs 30 s after startup, hourly thereafter. Active sessions never pruned; disk removal and directory stat happen outside the exclusive lock so a slow filesystem can't stall lookups.
**Client liveness.** Sessions carry a `ProcessHandle` for the client-reported pid, captured at registration time so Windows pid recycling can't produce false positives. A 30 s asio timer probes liveness and ends dead sessions through the normal remove path, producing a synthetic `Session ended: process exited (...)` line persisted to `log.bin`. Windows decodes common NTSTATUS exit codes to human names (Ctrl-C, access violation, stack overflow, ...); POSIX stays at plain `process exited`. Clients auto-fill `ClientPid` only for local targets (unix socket / loopback); the server defensively accepts pids only from `IsLocalMachineRequest()` peers. zenserver also reports its own pid when registering its self-session, so it shows up with a real pid in the dashboard and `zen sessions ls`.
**Synthetic end-of-session line.** `RemoveSession` takes an optional reason; before the session moves to the ended list it appends an Info-level `Session ended[: reason]` entry through the normal log path (released outside `m_Lock`). Current reasons: `client request` (HTTP DELETE), `server shutdown` (self-session), `process exited (...)` (liveness).
**UE_LOGFMT structured entries.** `POST /sessions/{id}/log` now accepts `{level, logger, format, fields}` alongside the existing `{level, logger, message}` shape. New `logtemplate.{h,cpp}` implements UE's `StructuredLog.cpp` template grammar (field paths with `.name` / `[N]`, `{{`/`}}` escapes, `$text` / `$format` / `$locformat` object conventions, bounded recursion). Renders to a displayable message at intake while persisting raw format + fields so a future UI can drill into fields without another schema bump. Hot path is zero-alloc — renders into `ExtendableStringBuilder<256>` using stack-buffered `Oid::ToString` / `IoHash::ToHexString` overloads. UI shows a `{…}` marker with the raw template + JSON-pretty fields on hover.
**Parent sessions.** `SessionInfo` gains `parent_session_id`; hub-managed storage server child processes inherit the hub's session id via `--parent-session=<id>`. `ZEN_SESSIONS_URL` env var becomes a fallback for `--sessions-url` / config when neither is provided. The in-process session log sink is disabled when a remote sessions target is configured (logs flow through `SessionsServiceClient` instead). The sessions UI groups child sessions under their parent (collapsible/expandable, sorts as a unit, supports nesting).
**Platform reporting.** `SessionInfo` gains `Platform`, flowed end-to-end: client auto-fills via `GetRuntimePlatformName()`, server persists in `info.cb` (`plat`) and emits on GET. UI renders as a SimpleIcons-style inline SVG (windows / macOS / iOS / linux / wine / android / playstation / xbox / nintendo) with case-insensitive alias resolution (Win32/Win64, PS4/PS5, XSX/XSS, NintendoSwitch, iPhone/iPad, Darwin/OSX). Unknown values fall back to text; sorting runs on the underlying string.
**WebSocket log streaming.** Sessions UI moves from 2 s polling to a WebSocket push model. New `WsSubscriber` has a stable id + helper methods. UI caps the log-line DOM at 5 000 entries with a shared cursor-regression helper, factored out of two call sites. Per-broadcast allocations trimmed on the push path; fixed a stack overrun in the WS log broadcast hex-id buffer.
**Log memory.** `LogEntry::Level` is now `logging::LogLevel` (1 byte) instead of `std::string` (~32 B) — saves ~310 KB per full 10 k-entry deque and eliminates a per-message allocation in the in-proc sink. On-disk format writes an int32 and accepts either int or legacy string on read. `LogEntry` strings now live in a `MemoryArena`; logger names are interned across the deque. `SessionLog::Append` and `WriteSessionInfoFile` drop their `UniqueBuffer` round-trip and write `CbObject::GetView()` straight through `BasicFile` / `SafeWriteFile`. Multi-entry `POST /log` batched under one lock + one push.
**In-proc log timestamps.** `InProcSessionLogSink::TimePointToDateTime` previously preserved only whole seconds, so every in-proc entry rendered at `.000` ms in the dashboard and `zen sessions tail`. It now adds the sub-second part (nanoseconds → 100 ns ticks) to keep ms precision end-to-end.
**UI.** Side "Session Details" panel is gone — its info is inline in the table (appname, mode, platform, id, timestamps, this/log pills, active dot). Bottom panel is a tabbed `Log | Metadata` view with a right-side "Session Information" panel beside metadata; log-only controls (filter, newest-first, follow, log-level filter, expand/collapse) hide when Metadata is active, polling keeps running across tab switches. Wide-mode toggle fills the viewport edge-to-edge. Log lines show the logger category; timestamps render in 24 h with zero-padded fields regardless of locale. Sessions list defaults to All / 10 per page / created-desc, gains click-to-sort headers on the full dataset, a header filter box, and a pager aligned to the table's right edge. Duplicate auto-injected `<h1>Sessions</h1>` removed.
## `zen sessions` CLI
New command tree on the `zen` client for inspecting the sessions service from the terminal:
- **`zen sessions ls`** — lists sessions (active first, ended next; newest-first within each group) with id, status, app/mode, pid, created, duration, and log count. Supports `--status active|ended|all` (default `all`).
- **`zen sessions status`** — prints the sessions service summary: self id, active / ended counts, and the read/write/delete/list/request/bad-request counters from `/stats/sessions`.
- **`zen sessions tail [session]`** — tails a session's log. With no argument it tails zenserver's own session (resolved via `/sessions/list`'s `self_id`); an explicit 24-hex id targets any session, including ended ones (historical replay). `--lines N` (default 50, 0 = all buffered) trims the initial dump client-side. `--follow` prefers a WebSocket push subscription on `/sessions/ws` for sub-second latency; on upgrade failure (older server, blocked port, unix-socket transport) it falls back to HTTP cursor polling at `--interval-ms` (default 500), with sleeps chunked to 50 ms so Ctrl-C reacts quickly. Output matches `zen::logging::FullFormatter` (`[YY-MM-DD HH:MM:SS.mmm] [lvl] [logger] message`); on a TTY the level is colored and the logger is bold, with continuation lines indented under the message column using the *visible* prefix width. 404 surfaces as `(session ended)` and connection errors as `(server gone)` — both clean exits, so stopping the server mid-tail no longer prints a stack trace.
- **`zen sessions ui`** — opens `<host>/dashboard/?page=sessions` in the user's default browser. Rejects unix-socket hosts.
A small `ZenServiceClient::IsUnixSocket()` helper now wraps the unix-socket check used by `ui`, `sessions tail` (WS path), and `sessions ui`.
## Logging
`BacklogSink` captures early-startup log entries in a fixed-capacity ring so late-attached sinks (session sink, file sink) can replay them. Detaches from the broadcast list when disabled; backed by destructor-only cleanup (no `unique_ptr` indirection per entry). Tuned defaults so the backlog covers typical bring-up without unbounded growth.
## `zen trace serve` viewer
- Compact timeline mode for high-density views.
- New `TRACE_INT_VALUE` / `TRACE_FLOAT_VALUE` counter trace points + a counters page in the viewer.
- Callsite tables collapsed into a single tabbed panel.
- Lossless `Oid <-> Guid` bridge for trace session ids; trace `SessionId` plumbed through.
- `tourist` parser hardening: bounds-check `BufferStream::read`, validate `Type::info_size` before `patch()`, convert `parse_important_aux` to a loop (avoids deep recursion), widen `ParserPool` index to `uint32`, bounds-check field offsets in the dispatcher, pin `Types::parse` buffer up-front.
## `MemoryArena`
Configurable chunk size, inline chunk list, oversize requests routed to truly-dedicated chunks (no slack waste, no fragmentation when one allocation is much larger than the chunk).
## Allocation cleanups across hot paths
- `zenhttp::HttpRequestRouter::HandleRequest` and `FormatPackageMessageInternal`: drop heap allocations.
- Compact-binary validation: `eastl::fixed_vector` + `eastl::sort`; eliminate `std::vector` churn.
- `zenserverprocess`: trim transient allocations in spawn paths.
- Sessions HTTP intake / broadcast: drop transient `std::string` allocs.
Diffstat (limited to 'src/zenserver/frontend/html/zen.css')
| -rw-r--r-- | src/zenserver/frontend/html/zen.css | 421 |
1 files changed, 307 insertions, 114 deletions
diff --git a/src/zenserver/frontend/html/zen.css b/src/zenserver/frontend/html/zen.css index d3c6c9036..46714a83d 100644 --- a/src/zenserver/frontend/html/zen.css +++ b/src/zenserver/frontend/html/zen.css @@ -2,64 +2,12 @@ /* theme -------------------------------------------------------------------- */ -/* system preference (default) */ -@media (prefers-color-scheme: light) { - :root { - --theme_g0: #1f2328; - --theme_g1: #656d76; - --theme_g2: #d0d7de; - --theme_g3: #f6f8fa; - --theme_g4: #ffffff; - - --theme_p0: #0969da; - --theme_p4: #ddf4ff; - --theme_p1: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 35%); - --theme_p2: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 60%); - --theme_p3: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 85%); - - --theme_ln: var(--theme_p0); - --theme_er: #ffebe9; - - --theme_ok: #1a7f37; - --theme_warn: #9a6700; - --theme_fail: #cf222e; - - --theme_bright: #1f2328; - --theme_faint: #6e7781; - --theme_border_subtle: #d8dee4; - --theme_highlight: #b8860b44; - } -} - -@media (prefers-color-scheme: dark) { - :root { - --theme_g0: #c9d1d9; - --theme_g1: #8b949e; - --theme_g2: #30363d; - --theme_g3: #161b22; - --theme_g4: #0d1117; - - --theme_p0: #58a6ff; - --theme_p4: #1c2128; - --theme_p1: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 35%); - --theme_p2: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 60%); - --theme_p3: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 85%); - - --theme_ln: #58a6ff; - --theme_er: #1c1c1c; - - --theme_ok: #3fb950; - --theme_warn: #d29922; - --theme_fail: #f85149; - - --theme_bright: #f0f6fc; - --theme_faint: #6e7681; - --theme_border_subtle: #21262d; - --theme_highlight: #e3b341aa; - } -} - -/* manual overrides (higher specificity than media queries) */ +/* Light tokens apply to the explicit data-theme="light" override and as the + default when no system preference matches the dark @media query below. + Dark tokens apply to data-theme="dark" and (when no explicit preference is + set) to dark system preference. Selector lists keep each token list defined + exactly once. */ +:root, :root[data-theme="light"] { --theme_g0: #1f2328; --theme_g1: #656d76; @@ -67,6 +15,10 @@ --theme_g3: #f6f8fa; --theme_g4: #ffffff; + /* surface backgrounds: bg0 matches the body, bg1 is one step raised */ + --theme_bg0: var(--theme_g4); + --theme_bg1: var(--theme_g3); + --theme_p0: #0969da; --theme_p4: #ddf4ff; --theme_p1: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 35%); @@ -86,6 +38,32 @@ --theme_highlight: #b8860b44; } +@media (prefers-color-scheme: dark) { + :root:not([data-theme="light"]) { + --theme_g0: #c9d1d9; + --theme_g1: #8b949e; + --theme_g2: #30363d; + --theme_g3: #161b22; + --theme_g4: #0d1117; + + --theme_p0: #58a6ff; + --theme_p4: #1c2128; + + --theme_ln: #58a6ff; + --theme_er: #1c1c1c; + + --theme_ok: #3fb950; + --theme_warn: #d29922; + --theme_fail: #f85149; + + --theme_bright: #f0f6fc; + --theme_faint: #6e7681; + --theme_border_subtle: #21262d; + --theme_highlight: #e3b341aa; + } +} + +/* Manual data-theme="dark" wins over system preference. */ :root[data-theme="dark"] { --theme_g0: #c9d1d9; --theme_g1: #8b949e; @@ -95,9 +73,6 @@ --theme_p0: #58a6ff; --theme_p4: #1c2128; - --theme_p1: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 35%); - --theme_p2: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 60%); - --theme_p3: color-mix(in oklab, var(--theme_p0), var(--theme_p4) 85%); --theme_ln: #58a6ff; --theme_er: #1c1c1c; @@ -114,10 +89,12 @@ /* theme toggle ------------------------------------------------------------- */ -#zen_ws_toggle { +/* Shared shape for the fixed top-right utility buttons (theme, wide, ws-pause). + Per-button rules below add only the `right` offset and any glyph-specific + typography (font-size for emoji buttons, padding-zero for SVG buttons). */ +.zen-floating-toggle { position: fixed; top: 16px; - right: 60px; z-index: 10; width: 36px; height: 36px; @@ -129,43 +106,48 @@ display: flex; align-items: center; justify-content: center; - font-size: 18px; - line-height: 1; transition: color 0.15s, background 0.15s, border-color 0.15s; user-select: none; } -#zen_ws_toggle:hover { +.zen-floating-toggle:hover { color: var(--theme_g0); background: var(--theme_p4); border-color: var(--theme_g1); } #zen_theme_toggle { - position: fixed; - top: 16px; right: 16px; - z-index: 10; - width: 36px; - height: 36px; - border-radius: 6px; - border: 1px solid var(--theme_g2); - background: var(--theme_g3); - color: var(--theme_g1); - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; font-size: 18px; line-height: 1; - transition: color 0.15s, background 0.15s, border-color 0.15s; - user-select: none; } -#zen_theme_toggle:hover { - color: var(--theme_g0); - background: var(--theme_p4); - border-color: var(--theme_g1); +#zen_ws_toggle { + right: 60px; + font-size: 18px; + line-height: 1; +} + +#zen_wide_toggle { + right: 104px; + padding: 0; +} + +#zen_wide_toggle svg { + width: 18px; + height: 18px; + display: block; +} + +/* Wide mode: lift the 1400px cap on the main container and drop the body's + horizontal padding so content fills the viewport edge-to-edge. Vertical + body padding stays so content doesn't touch the top of the viewport. */ +html[data-wide="true"] body { + padding-left: 0; + padding-right: 0; +} +html[data-wide="true"] #container { + max-width: none; } /* page --------------------------------------------------------------------- */ @@ -342,15 +324,39 @@ a { height: calc(100vh - 80px); } -.sessions-layout { +.sessions-header-row { display: flex; - gap: 1.5em; - align-items: flex-start; - flex-shrink: 0; + align-items: center; + gap: 12px; + margin-bottom: 8px; + flex-wrap: wrap; +} + +.sessions-list-filter { + padding: 6px 12px; + font-size: 14px; + font-family: inherit; + border: 1px solid var(--theme_g2); + border-radius: 6px; + background: var(--theme_bg1); + color: var(--theme_bright); + outline: none; + width: 240px; + max-width: 100%; +} +.sessions-list-filter:focus { + border-color: var(--theme_ln); + background: var(--theme_bg0); +} +.sessions-list-filter::placeholder { + color: var(--theme_g1); } .sessions-table { - flex: 1; + /* Natural height so the bottom panel sits right below the last row. The + section's column-flex lets .sessions-log-panel (flex: 1) absorb the + remaining vertical space for log viewing. */ + flex-shrink: 0; min-width: 0; } @@ -358,31 +364,157 @@ a { text-align: right; } -.sessions-table .zen_table > div > div:nth-child(2) { +/* appname (col 1), mode (col 2), platform (col 3) read better left-aligned */ +.sessions-table .zen_table > div > div:nth-child(1), +.sessions-table .zen_table > div > div:nth-child(2), +.sessions-table .zen_table > div > div:nth-child(3) { + text-align: left; +} + +/* id (col 4) is a hex string — monospace */ +.sessions-table .zen_table > div > div:nth-child(4) { font-family: 'SF Mono', 'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace; } -.sessions-detail { - width: 600px; - flex-shrink: 0; - font-size: 13px; +/* Platform-column icon: sized to the table row height, picks up theme color + via currentColor. Unknown platforms fall back to a plain text label. */ +.platform-icon { + display: inline-flex; + align-items: center; + color: var(--theme_g0); + opacity: 0.85; +} +.platform-icon svg { + width: 16px; + height: 16px; + fill: currentColor; } -.sessions-detail h3 { - margin: 0 0 0.6em 0; - font-size: 13px; - text-transform: uppercase; - letter-spacing: 0.5px; +/* Clickable column headers: the first row gets hover affordance. */ +.sessions-table .zen_table > div:first-child > div:hover { + color: var(--theme_g0); +} +.sessions-table .zen_table > div:first-child > div.sessions-sort-active { + color: var(--theme_ln); +} + +.sessions-group-toggle, +.sessions-group-toggle-spacer, +.sessions-group-child-spacer { + display: inline-flex; + align-items: center; + justify-content: center; + width: 18px; + margin-right: 4px; color: var(--theme_g1); + font-family: 'SF Mono', 'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace; } -.sessions-detail .zen_table { - margin-bottom: 1em; +.sessions-group-toggle { + border: 0; + padding: 0; + background: transparent; + cursor: pointer; +} + +.sessions-group-toggle:hover { + color: var(--theme_ln); +} + +.sessions-child-row { + background-color: color-mix(in srgb, var(--theme_bg1) 75%, transparent); +} + +.sessions-child-row:first-child { + padding-left: 14px; } -.sessions-detail-placeholder { +/* Bottom-panel tab strip (Log / Metadata). Lives inside + .sessions-log-header alongside the log-view controls. */ +.sessions-panel-tabs { + display: flex; + gap: 2px; +} +.sessions-panel-tab { + background: transparent; + border: none; + border-bottom: 2px solid transparent; + padding: 4px 10px; color: var(--theme_g1); - font-style: italic; + font: inherit; + font-size: 12px; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.5px; + cursor: pointer; +} +.sessions-panel-tab:hover { + color: var(--theme_g0); +} +.sessions-panel-tab.active { + color: var(--theme_ln); + border-bottom-color: var(--theme_ln); +} + +/* Log-only controls (filter, newest-first, follow). Wrapped so we can hide + them as a group when the Metadata tab is active. Natural width — the + sibling .sessions-log-spacer does the pushing. */ +.sessions-log-controls { + display: flex; + align-items: center; + gap: 8px; +} + +/* Flex spacer between the tab strip and the right-hand controls. Keeps the + Expand button flush right even when log_controls is hidden. */ +.sessions-log-spacer { + flex: 1; +} + +.sessions-metadata-body { + padding: 10px 12px; + overflow-y: auto; + flex: 1; + min-height: 0; +} + +.sessions-metadata-layout { + display: grid; + grid-template-columns: minmax(0, 1fr) minmax(280px, max-content); + gap: 16px; + align-items: start; +} + +.sessions-metadata-panel { + min-width: 0; +} + +.sessions-metadata-core-panel { + border-left: 1px solid var(--theme_g3); + padding-left: 16px; +} + +.sessions-metadata-heading { + margin: 10px 0 6px; + color: var(--theme_ln); + font-weight: 600; +} + +.sessions-metadata-heading:first-child { + margin-top: 0; +} + +@media (max-width: 900px) { + .sessions-metadata-layout { + grid-template-columns: 1fr; + } + + .sessions-metadata-core-panel { + border-left: 0; + border-top: 1px solid var(--theme_g3); + padding-left: 0; + padding-top: 10px; + } } .sessions-selected { @@ -415,7 +547,6 @@ a { color: var(--theme_g1); } .sessions-log-filter { - margin-left: 12px; padding: 6px 12px; font-size: 14px; font-family: inherit; @@ -433,6 +564,37 @@ a { .sessions-log-filter::placeholder { color: var(--theme_g1); } +.sessions-log-level-filter { + padding: 4px 8px; + font-size: 12px; + font-family: inherit; + border: 1px solid var(--theme_g2); + border-radius: 6px; + background: var(--theme_bg1); + color: var(--theme_bright); + outline: none; + cursor: pointer; +} +.sessions-log-level-filter:focus { + border-color: var(--theme_ln); +} + +/* Chevron-icon variant of .history-tab for the log-panel expand toggle. + Overrides the text-button padding/letterspacing so the icon sits in a + roughly square pill. Double-chevron up when collapsed, down when + expanded — see ICON_CHEVRON_* in sessions.js. */ +.sessions-panel-toggle { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 4px 8px; + letter-spacing: 0; +} +.sessions-panel-toggle svg { + width: 14px; + height: 14px; + display: block; +} .sessions-log-body { flex: 1; min-height: 0; @@ -474,29 +636,49 @@ a { font-weight: 600; } .sessions-log-level-info { color: var(--theme_ln); } -.sessions-log-level-warn { color: #d29922; } -.sessions-log-level-error { color: #f85149; } +.sessions-log-level-warn { color: var(--theme_warn); } +.sessions-log-level-error { color: var(--theme_fail); } .sessions-log-level-debug { color: var(--theme_g1); } +.sessions-log-logger { + flex-shrink: 0; + width: 12em; + color: var(--theme_ln); + opacity: 0.75; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} .sessions-log-msg { white-space: pre-wrap; word-break: break-all; } -.sessions-log-data { - color: var(--theme_g1); - white-space: pre-wrap; - word-break: break-all; +.sessions-log-fmt-marker { + flex-shrink: 0; + color: var(--theme_ln); + opacity: 0.6; + font-weight: 600; + cursor: help; + font-family: 'SF Mono', 'Cascadia Mono', Consolas, 'DejaVu Sans Mono', monospace; } -.sessions-self-pill { +.sessions-pill { display: inline-block; font-size: 0.7em; font-weight: 600; padding: 1px 6px; - margin-right: 6px; + margin-left: 6px; border-radius: 8px; + vertical-align: middle; + text-transform: uppercase; + letter-spacing: 0.3px; +} +.sessions-self-pill { background-color: var(--theme_p4); color: var(--theme_g0); - vertical-align: middle; +} +.sessions-log-indicator-pill { + background-color: var(--theme_g2); + color: var(--theme_g0); } .objectstore-bucket-detail { @@ -535,6 +717,17 @@ a { opacity: 0.7; } +/* Pager lives in the header row, to the right of the filter input. No + top margin since it's on the same baseline as tabs/filter. */ +.sessions-header-pager { + display: flex; + align-items: center; + gap: 6px; +} +.sessions-header-pager:empty { + display: none; +} + /* expandable cell ---------------------------------------------------------- */ .zen_expand_icon { |