diff options
Diffstat (limited to 'web/static')
| -rw-r--r-- | web/static/app.mjs | 100 | ||||
| -rw-r--r-- | web/static/catalog.mjs | 6 | ||||
| -rw-r--r-- | web/static/client.mjs | 3 | ||||
| -rw-r--r-- | web/static/index.html | 4 | ||||
| -rw-r--r-- | web/static/style.css | 15 |
5 files changed, 40 insertions, 88 deletions
diff --git a/web/static/app.mjs b/web/static/app.mjs index f18a103..33d5a08 100644 --- a/web/static/app.mjs +++ b/web/static/app.mjs @@ -21,7 +21,7 @@ function locationView() { return configuration?.catalog && ['sites', 'services'].includes(view) ? view : 'files'; } function viewURL(view, path = currentPath) { - return pathURL(path) + (view === 'files' ? '' : `?view=${view}`); + return pathURL(path) + (view === 'files' ? (current?.stream && path === currentPath ? '?follow=1' : '') : `?view=${view}`); } function showView(view) { activeView = view; @@ -43,7 +43,7 @@ function status(message, error = false) { function controls() { for (const id of ['go', 'reload', 'newfile', 'newdir', 'upload']) $(id).disabled = busy; $('save').disabled = busy || !current || current.stat.directory || $('editor').hidden || !dirty; - $('download').disabled = busy || !current || current.stat.directory; + $('download').disabled = busy || !current || current.stat.directory || current.stream; $('follow').disabled = busy || !current || current.stat.directory; $('rename').disabled = busy || currentPath === '/'; $('delete').disabled = busy || currentPath === '/'; @@ -66,14 +66,14 @@ async function connectedClient() { catch { throw new Error('Unable to reach the file server. Reload to try again.'); } return client; } -async function readPath(path) { +async function readPath(path, metadataOnly = false) { const active = await connectedClient(); - try { return await active.readPath(path); } + try { return await active.readPath(path, metadataOnly); } catch (error) { // A timed-out/closed transport has lost its fids. Retry reads once on a // fresh session. Writes are never replayed after an uncertain result. if (!active.closed) throw error; - return (await connectedClient()).readPath(path); + return (await connectedClient()).readPath(path, metadataOnly); } } function normalizePath(path) { @@ -131,16 +131,16 @@ function breadcrumbs(path) { $('up').href = pathURL(parent); $('up').dataset.path = parent; } -async function navigate(path, historyMode = 'push') { +async function navigate(path, historyMode = 'push', follow = false) { path = normalizePath(path); showView('files'); stopFollow(); status('Loading…'); - const result = await readPath(path); + const result = await readPath(path, follow); current = result; currentPath = path; dirty = false; for (const view of ['files', 'sites', 'services']) $(`view-${view}`).href = viewURL(view); $('path').value = path; - const url = pathURL(path); + const url = pathURL(path) + (follow ? '?follow=1' : ''); if (historyMode === 'push' && location.pathname + location.search + location.hash !== url) history.pushState(null, '', url); document.title = `${path} — 9web`; breadcrumbs(path); @@ -154,6 +154,11 @@ async function navigate(path, historyMode = 'push') { const permissions = document.createElement('td'), name = document.createElement('td'), size = document.createElement('td'); permissions.className = 'mode'; permissions.textContent = mode(entry); name.append(pathLink(entry.name + (entry.directory ? '/' : ''), child(path, entry.name), 'entry' + (entry.directory ? ' directory' : ''))); + if (!entry.directory) { + const followLink = pathLink('follow', child(path, entry.name), 'follow-link'); + followLink.dataset.follow = 'true'; followLink.href += '?follow=1'; + name.append(followLink); + } size.className = 'size'; size.textContent = entry.directory ? '—' : entry.length.toLocaleString(); row.append(permissions, name, size); rows.append(row); } @@ -163,7 +168,7 @@ async function navigate(path, historyMode = 'push') { } else { $('filename').textContent = result.stat.name; $('file-mode').textContent = mode(result.stat); - $('file-size').textContent = `${result.bytes.length.toLocaleString()} bytes`; + $('file-size').textContent = result.stream ? 'stream' : `${result.bytes.length.toLocaleString()} bytes`; let editable = true; try { if (result.bytes.includes(0)) throw new Error('Binary'); @@ -175,7 +180,7 @@ async function navigate(path, historyMode = 'push') { status('File loaded.'); } updateStat(result); - markTree(path); + if (follow && !result.stat.directory) startFollow(); } function mayLeave() { return !dirty || window.confirm('Discard unsaved changes?'); } document.addEventListener('click', event => { @@ -187,19 +192,19 @@ document.addEventListener('click', event => { if (view === activeView) return; history.pushState(null, '', viewURL(view)); showView(view); - if (view === 'files' && !current) action(() => navigate(currentPath, 'none')).then(loadTree); + if (view === 'files' && !current) action(() => navigate(currentPath, 'none')); return; } const link = event.target.closest('a[data-path]'); if (!link || event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return; event.preventDefault(); - if (!busy && mayLeave()) action(() => navigate(link.dataset.path)); + if (!busy && mayLeave()) action(() => navigate(link.dataset.path, 'push', link.dataset.follow === 'true')); }); $('path-form').onsubmit = event => { event.preventDefault(); if (mayLeave()) action(() => navigate($('path').value)); }; -$('reload').onclick = () => { if (mayLeave()) action(() => navigate(current ? currentPath : locationPath(), 'none')); }; +$('reload').onclick = () => { if (mayLeave()) action(() => navigate(current ? currentPath : locationPath(), 'none', Boolean(current?.stream))); }; $('editor').oninput = () => { dirty = true; controls(); }; $('save').onclick = () => action(async () => { const bytes = new TextEncoder().encode($('editor').value); @@ -224,26 +229,20 @@ window.addEventListener('popstate', () => { const view = locationView(), path = locationPath(); if (busy || (view === 'files' && path !== currentPath && !mayLeave())) { history.pushState(null, '', viewURL(activeView)); return; } showView(view); - if (view === 'files' && (!current || path !== currentPath)) action(() => navigate(path, 'none')).then(loadTree); + const follow = new URLSearchParams(location.search).get('follow') === '1'; + if (view === 'files' && (!current || path !== currentPath || Boolean(current.stream) !== follow)) action(() => navigate(path, 'none', follow)); }); window.addEventListener('beforeunload', event => { if (dirty) { event.preventDefault(); event.returnValue = ''; } }); -// ---- HTTP /fs view: tree, stat panel, create/rename/delete/upload, follow ---- +// ---- HTTP /fs view: stat panel, create/rename/delete/upload, follow ---- // These operate over the gateway's HTTP mapping of the same 9P tree, so they // stay independent of the WebSocket editing session above. function fsURL(path) { return '/fs' + path.split('/').map(encodeURIComponent).join('/'); } function parentOf(path) { return path.replace(/\/[^/]+$/, '') || '/'; } function baseName(path) { return path.split('/').filter(Boolean).pop() || ''; } function dirContext() { return current && current.stat.directory ? currentPath : parentOf(currentPath); } -function sortEntries(a, b) { return Number(b.dir) - Number(a.dir) || a.name.localeCompare(b.name); } - -async function fetchDir(path) { - const response = await fetch(fsURL(path) + (path.endsWith('/') ? '' : '/'), { headers: { accept: 'application/json' } }); - if (!response.ok) throw new Error(`list failed: ${response.status}`); - return response.json(); -} function renderStat(rows) { const dl = $('stat'); @@ -276,72 +275,37 @@ function updateStat(result) { }).catch(() => {}); } -function treeItem(entry, path) { - const li = document.createElement('li'); - const node = document.createElement('span'); - node.className = 'node' + (entry.dir ? ' dir' : ''); - node.dataset.node = path; - const twist = document.createElement('span'); - twist.className = 'twist'; - twist.textContent = entry.dir ? '▸' : ' '; - node.append(twist, document.createTextNode(entry.name)); - li.append(node); - node.onclick = () => { - if (entry.dir) toggleTree(li, path, twist); - else if (!busy && mayLeave()) action(() => navigate(path)); - }; - return li; -} -async function toggleTree(li, path, twist) { - const open = li.querySelector(':scope > ul'); - if (open) { open.remove(); twist.textContent = '▸'; return; } - twist.textContent = '▾'; - const ul = document.createElement('ul'); - li.append(ul); - try { - for (const entry of (await fetchDir(path)).sort(sortEntries)) ul.append(treeItem(entry, child(path, entry.name))); - } catch (error) { ul.textContent = '(unavailable)'; } -} -async function loadTree() { - const root = $('filetree'); - try { - const entries = (await fetchDir('/')).sort(sortEntries); - root.replaceChildren(...entries.map(entry => treeItem(entry, '/' + entry.name))); - } catch { /* upstream not ready; leave the last tree in place */ } -} -function markTree(path) { - for (const node of $('filetree').querySelectorAll('.node.current')) node.classList.remove('current'); - const match = $('filetree').querySelector(`.node[data-node="${CSS.escape(path)}"]`); - if (match) match.classList.add('current'); -} let stream = null; -function stopFollow() { +function stopFollow(clear = true) { if (stream) { stream.close(); stream = null; } $('follow').classList.remove('active'); - $('stream').hidden = true; - $('stream').textContent = ''; + if (clear) { $('stream').hidden = true; $('stream').textContent = ''; } } function startFollow() { if (!current || current.stat.directory) return; + current.stream = true; + history.replaceState(null, '', viewURL('files')); + controls(); $('editor').hidden = true; $('binary').hidden = true; $('edit-actions').hidden = true; const view = $('stream'); view.hidden = false; view.textContent = ''; $('follow').classList.add('active'); + status('Following stream…'); stream = new EventSource(fsURL(currentPath) + '?follow=1'); stream.onmessage = event => { view.textContent += event.data + '\n'; view.scrollTop = view.scrollHeight; }; - stream.addEventListener('eof', stopFollow); - stream.onerror = () => { status('Stream ended.'); stopFollow(); }; + stream.addEventListener('eof', () => { stopFollow(false); status('End of stream.'); }); + stream.onerror = () => { status('Stream ended.'); stopFollow(false); }; } $('follow').onclick = () => { - if ($('follow').classList.contains('active')) { stopFollow(); action(() => navigate(currentPath, 'none')); } + if ($('follow').classList.contains('active')) { stopFollow(false); status('Stream stopped.'); } else startFollow(); }; async function mutate(fn, done) { if (busy) return; busy = true; controls(); - try { await fn(); await loadTree(); status(done); } + try { await fn(); status(done); } catch (error) { status(error.message, true); } finally { busy = false; controls(); } } @@ -406,7 +370,7 @@ async function start() { currentPath = locationPath(); const view = locationView(); showView(view); - if (view === 'files') await action(() => navigate(currentPath, 'none')).then(loadTree); + if (view === 'files') await action(() => navigate(currentPath, 'none', new URLSearchParams(location.search).get('follow') === '1')); } catch (error) { status(error.message, true); } } start(); diff --git a/web/static/catalog.mjs b/web/static/catalog.mjs index d1d3444..e110dee 100644 --- a/web/static/catalog.mjs +++ b/web/static/catalog.mjs @@ -12,6 +12,7 @@ function url(address, port, protocol = 'http') { export function catalogViews(pathLink) { let active = 'files', timer = null, request = null, revision = 0, pending = new Set(); const rows = new Map(); + let namespace = ''; function status(view, text, error = false) { const p = $(`${view}-status`); p.textContent = text; p.classList.toggle('error', error); } @@ -19,7 +20,7 @@ export function catalogViews(pathLink) { if (pending.has(site.name)) return; pending.add(site.name); updateSite(site); try { - const r = await fetch(`/fs/sites/${encodeURIComponent(site.name)}/ctl`, { method: 'PUT', body: command }); + const r = await fetch(`/fs${namespace}/sites/${encodeURIComponent(site.name)}/ctl`, { method: 'PUT', body: command }); if (!r.ok) throw new Error(await r.text()); status('sites', `${site.title}: ${command} requested.`); } catch (error) { status('sites', error.message, true); } @@ -35,7 +36,7 @@ export function catalogViews(pathLink) { const tools = element('div'); tools.className = 'site-actions'; const build = element('button', 'build'), watch = element('button', 'watch'), cancel = element('button', 'cancel'); for (const b of [build, watch, cancel]) b.type = 'button'; - tools.append(build, watch, cancel, pathLink('files', `/sites/${site.name}/public`), pathLink('log', `/sites/${site.name}/log`)); + tools.append(build, watch, cancel, pathLink('files', `${namespace}/sites/${site.name}/public`), pathLink('log', `${namespace}/sites/${site.name}/log`)); actions.append(tools); tr.append(name, phase, finished, actions); row = { tr, link, root, phase, finished, build, watch, cancel }; rows.set(site.name, row); $('sites-entries').append(tr); @@ -74,6 +75,7 @@ export function catalogViews(pathLink) { if (!r.ok) throw new Error(`Unable to load ${view}: HTTP ${r.status}`); const data = await r.json(); if (ticket !== revision || active !== view) return; + namespace = data.namespace || ''; if (view === 'sites') { const names = new Set(data.sites.map(s => s.name)); for (const [name, row] of rows) if (!names.has(name)) { row.tr.remove(); rows.delete(name); } diff --git a/web/static/client.mjs b/web/static/client.mjs index 69f44d2..c012fc0 100644 --- a/web/static/client.mjs +++ b/web/static/client.mjs @@ -96,9 +96,10 @@ export class Client { if (live && !this.closed) await this.ask('clunk', 1); } } - readPath(path) { + readPath(path, metadataOnly = false) { return this.serial(() => this.withFile(path, async () => { const stat = JSON.parse(decoder.decode((await this.ask('stat', 1)).data)); + if (metadataOnly && !stat.directory) return { stat, entries: [], bytes: new Uint8Array(), stream: true }; const opened = await this.ask('open', 1, 0); const count = Math.min(this.wasm.max_read(), opened.number || Infinity); let offset = 0; diff --git a/web/static/index.html b/web/static/index.html index 4ed498d..c392e65 100644 --- a/web/static/index.html +++ b/web/static/index.html @@ -33,10 +33,6 @@ </form> </nav> <div class="layout"> - <aside id="sidebar" aria-label="Tree"> - <div class="tree-head">tree</div> - <ul id="filetree" role="tree"></ul> - </aside> <main> <nav id="breadcrumbs" aria-label="Breadcrumb"><a href="/" data-path="/">root</a></nav> <div class="summary"> diff --git a/web/static/style.css b/web/static/style.css index 53ccda3..e17f1e5 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -8,6 +8,7 @@ body { margin: 0; padding: 22px 3%; } a { color: #07539b; text-decoration: none; } a:hover { text-decoration: underline; } +.follow-link { margin-left: 14px; font-size: 11px; color: #777; } header { padding: 0 8px 17px; } .brand { font-size: 30px; font-weight: bold; color: #222; letter-spacing: -1px; } .description { color: #777; margin-top: 1px; } @@ -81,17 +82,7 @@ textarea { display: block; width: 100%; min-height: 420px; resize: vertical; bor #binary { color: #777; padding: 16px 8px; } .actions { display: flex; align-items: center; gap: 12px; margin-top: 10px; font-size: 12px; } #edit-status { color: #777; } -.layout { display: flex; align-items: flex-start; gap: 16px; } -#sidebar { flex: 0 0 220px; border-right: 1px solid #e2e2e2; padding: 8px 10px 0 0; min-width: 0; } -.tree-head { color: #999; font-size: 11px; text-transform: uppercase; letter-spacing: .05em; padding: 4px; } -#filetree, #filetree ul { list-style: none; margin: 0; padding: 0; } -#filetree ul { margin-left: 12px; } -#filetree li { line-height: 1.7; white-space: nowrap; } -#filetree .node { cursor: pointer; font-family: monospace; overflow-wrap: anywhere; } -#filetree .node.dir { font-weight: bold; } -#filetree .node.current { background: #ccc; } -#filetree .twist { display: inline-block; width: 12px; color: #999; } -.layout main { flex: 1 1 auto; min-width: 0; } +.layout main { min-width: 0; } #stat-panel { margin-top: 18px; border-top: 1px solid #eee; padding-top: 8px; } #stat-panel h2 { font-size: 12px; text-transform: uppercase; letter-spacing: .05em; color: #999; margin: 0 0 6px; } #stat { display: grid; grid-template-columns: max-content 1fr; gap: 2px 12px; font: 12px monospace; margin: 0; } @@ -122,6 +113,4 @@ a:focus-visible, button:focus-visible { outline: 2px solid #07539b; outline-offs .summary { align-items: start; } .file-heading { gap: 7px 12px; } textarea { min-height: 350px; } - .layout { flex-direction: column; } - #sidebar { flex: none; width: 100%; border-right: 0; border-bottom: 1px solid #e2e2e2; max-height: 180px; overflow: auto; padding: 0 0 6px; } } |
