mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-05-12 16:54:43 +00:00
cea2c70d12
## Summary PR 1 of 3 for #1034 — channel UX redesign. Replaces the cramped inline "type a name or 32-hex blob" form with a clear modal dialog, and reorganizes the sidebar into three labeled sections. **Scope of this PR:** Modal UI + sectioned sidebar. QR generation/scan is deferred to PR #2 (placeholders are wired and ready). `channel-decrypt.js` crypto is untouched. ## What changed ### New modal: `[+ Add Channel]` Triggered by the new sidebar button. Three sections: 1. **Generate PSK Channel** — name + `[Generate & Show QR]` → `crypto.getRandomValues(16)` → hex → `ChannelDecrypt.storeKey`. QR rendering ships in PR #2; for now `#qr-output` surfaces the hex key as text. 2. **Add Private Channel (PSK)** — 32-hex input (regex-validated), optional display name, `[Add]`. `[📷 Scan QR]` placeholder is present but `disabled` (PR #2 wires it). 3. **Monitor Hashtag Channel** — non-editable `#` prefix + free text + case-sensitivity warning + `[Monitor]`. Reuses `ChannelDecrypt.deriveKey`. Privacy footer: _"🔒 Keys stay in your browser. CoreScope is a passive observer..."_ Close ✕, backdrop click, and Escape all dismiss. ### Sectioned sidebar `renderChannelList()` rewritten to render three sections: - **My Channels** — `userAdded` channels. ✕ always visible. Last sender + relative time. - **Network** — server-known cleartext channels. - **Encrypted (N)** — collapsed by default (toggle persists in `localStorage`). Shows hash byte + packet count. The legacy "🔒 No key" checkbox and `#chShowEncrypted` toggle are removed entirely. Encrypted channels are always fetched; the renderer groups them. ## Tests - **Unit** — `test-channel-modal-ux.js` (33 assertions): added to `test-all.sh`. Covers sidebar button, modal markup, three sections, QR placeholders, privacy footer, sectioned sidebar, modal handlers (incl. `crypto.getRandomValues(16)`). - **E2E** — `test-channel-modal-e2e.js` (Playwright, 14 steps). Covers modal open/close, section rendering, invalid-hex error, valid-hex storage, encrypted-section toggle. Run with: ``` CHROMIUM_PATH=/usr/bin/chromium-browser BASE_URL=http://localhost:38201 node test-channel-modal-e2e.js ``` - `test-channel-psk-ux.js` — updated to reference `#chPskName` (was `#chKeyLabelInput`). ### Red→green proof - Red commit (`7ee421b`): test added with 31 expected assertion failures, no source change. - Green commit (`897be8f`): implementation lands, test passes 33/33. ## Browser-validated Built `cmd/server/`, ran against `test-fixtures/e2e-fixture.db`, exercised modal open → invalid hex → valid hex → key persisted → modal closes → sectioned sidebar renders + Encrypted toggle expands. All 14 E2E steps pass. ## What's NOT in this PR - QR code rendering (PR #2) - Camera/QR scanning (PR #2) - Migration of legacy localStorage format (PR #3, if needed — current key format is unchanged) - `channel-decrypt.js` changes (none — UI-only PR) ## Acceptance criteria from #1034 - [x] Modal opens on `[+ Add Channel]` click - [x] Three sections clearly separated with labels - [x] Add PSK: accepts 32-hex (QR scan = PR #2) - [x] Monitor Hashtag: derives key, case-sensitivity warning shown - [x] Privacy footer present - [x] Sidebar: three sections (My Channels / Network / Encrypted) - [x] ✕ button visible and functional on My Channels entries - [x] "No key" checkbox removed - [ ] Generate PSK QR display — text fallback only; QR is PR #2 - [ ] Old stored keys migrate seamlessly — no migration needed (storage format unchanged) Refs #1034 --------- Co-authored-by: meshcore-bot <bot@meshcore.local>
162 lines
6.9 KiB
JavaScript
162 lines
6.9 KiB
JavaScript
/**
|
|
* E2E (#1034 PR1): Channel Add modal + sectioned sidebar.
|
|
*
|
|
* Boots a headless Chromium against a locally running corescope-server and
|
|
* exercises:
|
|
* - sidebar [+ Add Channel] opens modal
|
|
* - modal renders three labeled sections + privacy footer + QR placeholders
|
|
* - close (✕) hides modal
|
|
* - sectioned sidebar renders My Channels / Network / Encrypted sections
|
|
* - PSK add flow: invalid hex → error; valid hex → modal closes
|
|
*
|
|
* Usage: BASE_URL=http://localhost:38201 node test-channel-modal-e2e.js
|
|
*/
|
|
'use strict';
|
|
const { chromium } = require('playwright');
|
|
|
|
const BASE = process.env.BASE_URL || 'http://localhost:38201';
|
|
|
|
let passed = 0, failed = 0;
|
|
async function step(name, fn) {
|
|
try { await fn(); passed++; console.log(' ✓ ' + name); }
|
|
catch (e) { failed++; console.error(' ✗ ' + name + ': ' + e.message); }
|
|
}
|
|
function assert(c, m) { if (!c) throw new Error(m || 'assertion failed'); }
|
|
|
|
(async () => {
|
|
const browser = await chromium.launch({
|
|
headless: true,
|
|
executablePath: process.env.CHROMIUM_PATH || undefined,
|
|
args: ['--no-sandbox', '--disable-gpu', '--disable-dev-shm-usage'],
|
|
});
|
|
const ctx = await browser.newContext();
|
|
const page = await ctx.newPage();
|
|
page.setDefaultTimeout(8000);
|
|
page.on('pageerror', (e) => console.error('[pageerror]', e.message));
|
|
|
|
console.log(`\n=== #1034 PR1 E2E against ${BASE} ===`);
|
|
|
|
await step('navigate to /channels', async () => {
|
|
await page.goto(BASE + '/#/channels', { waitUntil: 'domcontentloaded' });
|
|
await page.waitForSelector('#chAddChannelBtn', { timeout: 8000 });
|
|
});
|
|
|
|
await step('Add Channel button is visible', async () => {
|
|
const text = await page.textContent('#chAddChannelBtn');
|
|
assert(/Add Channel/.test(text), 'button text: ' + text);
|
|
});
|
|
|
|
await step('modal hidden on load', async () => {
|
|
const isHidden = await page.evaluate(() => {
|
|
const m = document.getElementById('chAddChannelModal');
|
|
return !!m && (m.classList.contains('hidden') || m.hasAttribute('hidden'));
|
|
});
|
|
assert(isHidden, 'modal should start hidden');
|
|
});
|
|
|
|
await step('clicking [+ Add Channel] opens modal', async () => {
|
|
await page.click('#chAddChannelBtn');
|
|
await page.waitForSelector('#chAddChannelModal:not(.hidden)', { timeout: 3000 });
|
|
const visible = await page.isVisible('#chAddChannelModal');
|
|
assert(visible, 'modal should be visible after click');
|
|
});
|
|
|
|
await step('modal renders all three section titles', async () => {
|
|
const html = await page.innerHTML('#chAddChannelModal');
|
|
assert(html.includes('Generate PSK Channel'), 'section 1 missing');
|
|
assert(html.includes('Add Private Channel (PSK)'), 'section 2 missing');
|
|
assert(html.includes('Monitor Hashtag Channel'), 'section 3 missing');
|
|
});
|
|
|
|
await step('modal renders QR placeholders', async () => {
|
|
assert(await page.isVisible('#qr-output'), '#qr-output missing');
|
|
const scanBtn = await page.$('#scan-qr-btn');
|
|
assert(scanBtn, '#scan-qr-btn missing');
|
|
const disabled = await scanBtn.getAttribute('disabled');
|
|
assert(disabled !== null, '#scan-qr-btn must be disabled placeholder');
|
|
});
|
|
|
|
await step('modal renders privacy footer', async () => {
|
|
const footer = await page.textContent('#chAddChannelModal .ch-modal-footer');
|
|
assert(/Keys stay in your browser/.test(footer), 'footer text missing: ' + footer);
|
|
assert(/passive observer/.test(footer), 'passive observer text missing');
|
|
});
|
|
|
|
await step('modal renders case-sensitivity warning', async () => {
|
|
const warn = await page.textContent('#chAddChannelModal .ch-modal-warn');
|
|
assert(/[Cc]ase-sensitive/.test(warn), 'warning missing: ' + warn);
|
|
});
|
|
|
|
await step('PSK add: invalid hex shows inline error', async () => {
|
|
await page.fill('#chPskKey', 'not-hex');
|
|
await page.click('#chPskAddBtn');
|
|
await page.waitForFunction(() => {
|
|
const e = document.getElementById('chPskError');
|
|
return e && e.style.display !== 'none' && /hex/i.test(e.textContent);
|
|
}, { timeout: 3000 });
|
|
});
|
|
|
|
await step('close button (✕) hides modal', async () => {
|
|
await page.click('#chModalClose');
|
|
await page.waitForFunction(() => {
|
|
const m = document.getElementById('chAddChannelModal');
|
|
return m && m.classList.contains('hidden');
|
|
}, { timeout: 3000 });
|
|
});
|
|
|
|
await step('sidebar renders three sections (My Channels / Network / Encrypted)', async () => {
|
|
// Wait for channel list to populate from API (or render empty-state).
|
|
await page.waitForFunction(() => {
|
|
const el = document.getElementById('chList');
|
|
if (!el) return false;
|
|
return el.querySelector('.ch-section-mychannels') &&
|
|
el.querySelector('.ch-section-network') &&
|
|
el.querySelector('.ch-section-encrypted');
|
|
}, { timeout: 8000 });
|
|
const headers = await page.$$eval('.ch-section-header', els => els.map(e => e.textContent.trim()));
|
|
const joined = headers.join(' | ');
|
|
assert(/My Channels/.test(joined), 'My Channels header missing: ' + joined);
|
|
assert(/Network/.test(joined), 'Network header missing');
|
|
assert(/Encrypted/.test(joined), 'Encrypted header missing');
|
|
});
|
|
|
|
await step('Encrypted section is collapsed by default', async () => {
|
|
const collapsed = await page.getAttribute('.ch-section-encrypted', 'data-encrypted-collapsed');
|
|
assert(collapsed === 'true', 'expected data-encrypted-collapsed=true, got ' + collapsed);
|
|
const bodyHidden = await page.evaluate(() => {
|
|
const b = document.getElementById('chEncryptedBody');
|
|
return b ? b.hasAttribute('hidden') : null;
|
|
});
|
|
assert(bodyHidden === true, 'encrypted body should be hidden initially');
|
|
});
|
|
|
|
await step('clicking Encrypted toggle expands it', async () => {
|
|
await page.click('#chEncryptedToggle');
|
|
const bodyHidden = await page.evaluate(() => {
|
|
const b = document.getElementById('chEncryptedBody');
|
|
return b ? b.hasAttribute('hidden') : null;
|
|
});
|
|
assert(bodyHidden === false, 'encrypted body should be visible after toggle');
|
|
});
|
|
|
|
await step('PSK add: valid hex closes modal and persists key', async () => {
|
|
await page.click('#chAddChannelBtn');
|
|
await page.waitForSelector('#chAddChannelModal:not(.hidden)');
|
|
const validHex = 'cafebabe' + '00112233' + '44556677' + '8899aabb';
|
|
await page.fill('#chPskKey', validHex);
|
|
await page.fill('#chPskName', 'E2E Test Channel');
|
|
await page.click('#chPskAddBtn');
|
|
await page.waitForFunction(() => {
|
|
const m = document.getElementById('chAddChannelModal');
|
|
return m && m.classList.contains('hidden');
|
|
}, { timeout: 5000 });
|
|
const stored = await page.evaluate(() => localStorage.getItem('corescope_channel_keys') || '');
|
|
assert(/cafebabe/i.test(stored), 'expected stored key in localStorage corescope_channel_keys, got: ' + stored);
|
|
});
|
|
|
|
await browser.close();
|
|
|
|
console.log(`\n=== Results: passed ${passed} failed ${failed} ===`);
|
|
process.exit(failed > 0 ? 1 : 0);
|
|
})().catch(e => { console.error(e); process.exit(1); });
|