diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0136a254..2553f6e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -400,6 +400,7 @@ jobs: CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1599-replay-freeze-e2e.js 2>&1 | tee -a e2e-output.txt CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m1-icons-e2e.js 2>&1 | tee -a e2e-output.txt CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m2-icons-e2e.js 2>&1 | tee -a e2e-output.txt + CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m3-icons-e2e.js 2>&1 | tee -a e2e-output.txt BASE_URL=http://localhost:13581 node test-issue-1224-channels-mobile-ux-e2e.js 2>&1 | tee -a e2e-output.txt BASE_URL=http://localhost:13581 node test-issue-1367-channels-chat-app-e2e.js 2>&1 | tee -a e2e-output.txt BASE_URL=http://localhost:13581 node test-issue-1236-map-mobile-e2e.js 2>&1 | tee -a e2e-output.txt diff --git a/public/app.js b/public/app.js index 324f842a..a0d8e7fa 100644 --- a/public/app.js +++ b/public/app.js @@ -737,11 +737,11 @@ function _showPullToast(msg, ok) { } function pullReconnect() { - // If WS is connected (readyState OPEN), give a brief "Connected βœ“" + // If WS is connected (readyState OPEN), give a brief "Connected" // confirmation but still cycle so the user sees fresh data. const wasOpen = ws && ws.readyState === 1; if (wasOpen) { - _showPullToast('Connected βœ“', true); + _showPullToast('Connected', true); // Fast cycle: close and let onclose reconnect immediately try { ws.close(); } catch (e) {} } else { @@ -903,8 +903,8 @@ registerPage('tools-landing', { '
' + '

Tools

' + '
' + - '

πŸ” Path Inspector

Resolve prefix paths to candidate full-pubkey routes with confidence scoring.

' + - '

πŸ“‘ Trace Viewer

View detailed packet traces by hash.

' + + '

Path Inspector

Resolve prefix paths to candidate full-pubkey routes with confidence scoring.

' + + '

Trace Viewer

View detailed packet traces by hash.

' + '
' + '
'; }, @@ -1375,7 +1375,7 @@ window.addEventListener('DOMContentLoaded', () => { } // #1139 Bug B: floor the More menu at >=2 items. The greedy // fits() loop above is happy to stop after pushing exactly ONE - // link into overflow (commonly "🎡 Lab" at ~1600px viewports), + // link into overflow (commonly "🎡 Lab" at ~1600px viewports), // EMOJI-OK: comment referencing prior nav label // producing a degenerate single-item dropdown. If exactly one // link overflowed, promote one more from the queue so the user // sees a useful menu instead of a one-item fragment. Skip when @@ -1493,7 +1493,7 @@ window.addEventListener('DOMContentLoaded', () => { async function renderFavDropdown() { const favs = getFavorites(); if (!favs.length) { - favDropdown.innerHTML = '
No favorites yet.
Click β˜† on any node to add it.
'; + favDropdown.innerHTML = '
No favorites yet.
Click the star on any node to add it.
'; return; } favDropdown.innerHTML = '
Loading...
'; @@ -1501,16 +1501,17 @@ window.addEventListener('DOMContentLoaded', () => { try { const h = await api('/nodes/' + pk + '/health', { ttl: CLIENT_TTL.nodeHealth }); const age = h.stats.lastHeard ? Date.now() - new Date(h.stats.lastHeard).getTime() : null; - const status = age === null ? 'πŸ”΄' : age < HEALTH_THRESHOLDS.nodeDegradedMs ? '🟒' : age < HEALTH_THRESHOLDS.nodeSilentMs ? '🟑' : 'πŸ”΄'; + const statusCls = age === null ? 'status-err' : age < HEALTH_THRESHOLDS.nodeDegradedMs ? 'status-ok' : age < HEALTH_THRESHOLDS.nodeSilentMs ? 'status-warn' : 'status-err'; + const statusLabel = age === null ? 'unknown' : age < HEALTH_THRESHOLDS.nodeDegradedMs ? 'healthy' : age < HEALTH_THRESHOLDS.nodeSilentMs ? 'degraded' : 'silent'; return '' - + '' + status + '' + + '' + '' + (h.node.name || truncate(pk, 12)) + '' + '' + (h.stats.lastHeard ? timeAgo(h.stats.lastHeard) : 'never') + '' + favStar(pk, 'fav-dd-star') + ''; } catch { return '' - + '❓' + + '' + '' + truncate(pk, 16) + '' + 'not found' + favStar(pk, 'fav-dd-star') diff --git a/public/channels.js b/public/channels.js index 5aa87382..b08b401d 100644 --- a/public/channels.js +++ b/public/channels.js @@ -174,7 +174,7 @@ tip.className = 'ch-node-tooltip'; tip.setAttribute('role', 'tooltip'); const roleKey = node.role || (node.is_repeater ? 'repeater' : node.is_room ? 'room' : node.is_sensor ? 'sensor' : 'companion'); - const role = (ROLE_EMOJI[roleKey] || '●') + ' ' + (ROLE_LABELS[roleKey] || roleKey); + const role = (ROLE_EMOJI[roleKey] || '') + ' ' + (ROLE_LABELS[roleKey] || roleKey); const lastActivity = node.last_heard || node.last_seen; const lastSeen = lastActivity ? timeAgo(lastActivity) : 'unknown'; tip.innerHTML = `
${escapeHtml(node.name)}
@@ -237,7 +237,7 @@ if (!node) { panel.innerHTML = `
${escapeHtml(name)} - +
No node record found β€” this sender has only been seen in channel messages, not via adverts.
@@ -252,13 +252,13 @@ const n = detail.node; const adverts = detail.recentAdverts || []; const roleKey = n.role || (n.is_repeater ? 'repeater' : n.is_room ? 'room' : n.is_sensor ? 'sensor' : 'companion'); - const role = (ROLE_EMOJI[roleKey] || '●') + ' ' + (ROLE_LABELS[roleKey] || roleKey); + const role = (ROLE_EMOJI[roleKey] || '') + ' ' + (ROLE_LABELS[roleKey] || roleKey); const lastActivity = n.last_heard || n.last_seen; const lastSeen = lastActivity ? timeAgo(lastActivity) : 'unknown'; panel.innerHTML = `
${escapeHtml(n.name || 'Unknown')} - +
Role ${role}
@@ -274,7 +274,7 @@ _focusTrapCleanup = trapFocus(panel); panel.querySelector('.ch-node-close')?.focus(); } catch (e) { - panel.innerHTML = `
${escapeHtml(name)}
Failed to load
`; + panel.innerHTML = `
${escapeHtml(name)}
Failed to load
`; _focusTrapCleanup = trapFocus(panel); panel.querySelector('.ch-node-close')?.focus(); } @@ -495,7 +495,7 @@ // Merge user-stored keys into the channel list. // If a stored key matches a server-known channel, mark that channel as - // userAdded so the βœ• button appears β€” otherwise the user has no way to + // userAdded so the close button appears // EMOJI-OK: prior glyph reference β€” otherwise the user has no way to // remove a key they added but that the server already knows about. function mergeUserChannels() { var keys = ChannelDecrypt.getStoredKeys(); @@ -721,7 +721,7 @@ app.innerHTML = `
-
πŸ’¬ Channels
+
Channels
@@ -735,10 +735,10 @@
@@ -795,7 +795,7 @@ QR section bleed into the Add submit flow. --> @@ -997,7 +997,7 @@ try { src.select(); } catch (e2) {} var doneCopy = function () { var orig = copyBtn.textContent; - copyBtn.textContent = 'βœ“ Copied'; + copyBtn.innerHTML = ' Copied'; setTimeout(function () { copyBtn.textContent = orig; }, 1200); }; if (navigator.clipboard && navigator.clipboard.writeText) { @@ -1254,7 +1254,7 @@ } } else if (ch) { // Server-known channel: keep the row, just unmark as user-added so - // the βœ• disappears until they re-add a key. + // the close button disappears until they re-add a key. // EMOJI-OK: prior glyph reference ch.userAdded = false; // If this was the selected channel, clear decrypted messages since // the key is gone β€” they can't be re-decrypted without re-adding it. @@ -1707,7 +1707,7 @@ const encClass = isUserAdded ? ' ch-user-added' : (isEncrypted ? ' ch-encrypted' : ''); - const badgeIcon = isUserAdded ? 'πŸ”“' : (isEncrypted ? 'πŸ”’' : null); + const badgeIcon = isUserAdded ? '' : (isEncrypted ? '' : null); const abbr = badgeIcon || (name.startsWith('#') ? name.slice(0, 3) : name.slice(0, 2).toUpperCase()); const chColor = window.ChannelColors ? window.ChannelColors.get(ch.hash) : null; const dotStyle = chColor ? ` style="background:${chColor}"` : ''; @@ -1727,14 +1727,14 @@ + ' aria-label="' + ariaVerb + ' ' + escapeHtml(name) + '">' + glyph + ''; } const removeBtn = isUserAdded - ? iconBtn('ch-remove-btn', 'data-remove-channel', ch.hash, name, 'βœ•', + ? iconBtn('ch-remove-btn', 'data-remove-channel', ch.hash, name, '', 'Remove channel and clear saved key', 'Remove', '') : ''; const shareBtn = isUserAdded - ? iconBtn('ch-share-btn', 'data-share-channel', ch.hash, name, 'πŸ“€ Share', + ? iconBtn('ch-share-btn', 'data-share-channel', ch.hash, name, ' Share', 'Share channel key (QR + URL)', 'Share', ' aria-haspopup="dialog"') : ''; - const userBadge = isUserAdded ? ' πŸ”‘' : ''; + const userBadge = isUserAdded ? ' ' : ''; const unreadBadge = (ch.unread && ch.unread > 0) ? ' ' + (ch.unread > 99 ? '99+' : ch.unread) + '' : ''; @@ -1744,7 +1744,7 @@
${escapeHtml(name)}${userBadge}${unreadBadge} - ${chColor ? 'βœ•' : ''} + ${chColor ? '' : ''} ${time}${shareBtn}${removeBtn}
${escapeHtml(preview)}
@@ -1762,8 +1762,8 @@ function avatarTextForChannel(ch) { const name = ch && ch.name ? String(ch.name) : ''; if (name.charAt(0) === '#') return name.slice(0, 3); // "#wa" - if (ch && ch.encrypted && !ch.userAdded) return 'πŸ”’'; - if (ch && ch.userAdded) return 'πŸ”‘'; + if (ch && ch.encrypted && !ch.userAdded) return ''; + if (ch && ch.userAdded) return ''; // Fallback: 2-char uppercase abbreviation. return name.replace(/[^A-Za-z0-9]/g, '').slice(0, 2).toUpperCase() || String(ch && ch.hash || '?').slice(0, 2).toUpperCase(); @@ -1789,12 +1789,14 @@ preview = ch.messageCount + ' messages'; } const abbr = avatarTextForChannel(ch); + // abbr may be a Phosphor sprite (HTML) or plain text β€” detect & emit raw vs escaped. + const isHtmlAbbr = typeof abbr === 'string' && abbr.startsWith('' + '' + + '" aria-hidden="true">' + (isHtmlAbbr ? abbr : escapeHtml(abbr)) + '
' + '
' + '
' + '' + escapeHtml(name) + '' + @@ -1833,7 +1835,7 @@ if (mine.length > 0) { sections.push( `
-
My Channels πŸ–₯️ (this browser)
+
My Channels (this browser)
${mine.map(renderChannelRow).join('')}
` ); @@ -1914,7 +1916,7 @@ }); if (isStaleMessageRequest(request)) return { stale: true }; if (result.wrongKey) { - msgEl.innerHTML = '
πŸ”’ Key does not match β€” no messages could be decrypted
'; + msgEl.innerHTML = '
Key does not match β€” no messages could be decrypted
'; return { wrongKey: true, messageCount: 0 }; } if (result.error) { @@ -1963,7 +1965,7 @@ } } // #781: No matching key found β€” show lock message instead of fetching gibberish - msgEl.innerHTML = '
πŸ”’ This channel is encrypted and no decryption key is configured
'; + msgEl.innerHTML = '
This channel is encrypted and no decryption key is configured
'; return; } @@ -1992,7 +1994,7 @@ if (isStaleMessageRequest(request)) return; var foundCh = (allCh.channels || []).find(function (c) { return c.hash === hash; }); if (foundCh && foundCh.encrypted === true) { - msgEl.innerHTML = '
πŸ”’ This channel is encrypted and no decryption key is configured
'; + msgEl.innerHTML = '
This channel is encrypted and no decryption key is configured
'; return; } // Unencrypted (or unknown) β€” fall through to the REST fetch below. diff --git a/public/home.js b/public/home.js index 0c86d8b8..23d7478f 100644 --- a/public/home.js +++ b/public/home.js @@ -49,12 +49,12 @@

How familiar are you with MeshCore?

@@ -98,7 +98,7 @@ ${!hasNodes ? `
-
πŸ“‘
+

Claim your first node

Search for your node above, or paste your public key. Once claimed, you'll see live status, signal quality, and who's hearing you.

@@ -113,18 +113,18 @@ ${exp ? '' : `
-

πŸš€ Getting on the mesh${homeCfg?.steps ? '' : ' β€” SF Bay Area'}

+

Getting on the mesh${homeCfg?.steps ? '' : ' β€” SF Bay Area'}

${checklist(homeCfg)}
`}
${homeCfg?.footerLinks ? homeCfg.footerLinks.map(l => `${escapeHtml(l.label)}`).join('') : ` - πŸ“¦ Packets - πŸ—ΊοΈ Network Map - πŸ”΄ Live - πŸ“‘ All Nodes - πŸ’¬ Channels`} + Packets + Network Map + Live + All Nodes + Channels`}
${exp ? 'Want setup guides? ' : 'Already know MeshCore? '} @@ -183,7 +183,7 @@
${n.role || '?'}
`; @@ -202,11 +202,11 @@ if (isMyNode(pk)) { removeMyNode(pk); btn.classList.remove('claimed'); - btn.textContent = '+ Claim'; + btn.innerHTML = '+ Claim'; } else { addMyNode(pk, nm); btn.classList.add('claimed'); - btn.textContent = 'βœ“ Mine'; + btn.innerHTML = ' Mine'; } loadMyNodes(); }); @@ -277,7 +277,8 @@ const age = stats.lastHeard ? Date.now() - new Date(stats.lastHeard).getTime() : null; const status = age === null ? 'silent' : age < HEALTH_THRESHOLDS.nodeDegradedMs ? 'healthy' : age < HEALTH_THRESHOLDS.nodeSilentMs ? 'degraded' : 'silent'; - const statusDot = status === 'healthy' ? '🟒' : status === 'degraded' ? '🟑' : 'πŸ”΄'; + const statusCls = status === 'healthy' ? 'status-ok' : status === 'degraded' ? 'status-warn' : 'status-err'; + const statusDot = ''; const statusText = status === 'healthy' ? 'Active' : status === 'degraded' ? 'Degraded' : 'Silent'; const name = node.name || mn.name || truncate(mn.pubkey, 12); @@ -294,7 +295,7 @@
${statusDot}
${escapeHtml(name)}
${node.role || '?'}
- +
${statusText}${stats.lastHeard ? ' Β· ' + timeAgo(stats.lastHeard) : ''}
@@ -324,7 +325,7 @@
`; } catch (err) { const is404 = err && err.message && err.message.includes('404'); - const statusIcon = is404 ? 'πŸ“‘' : '❓'; + const statusIcon = is404 ? '' : ''; const statusMsg = is404 ? 'Waiting for first advert β€” this node has been seen in channel messages but hasn\u2019t advertised yet' : 'Could not load data'; @@ -332,7 +333,7 @@
${statusIcon}
${escapeHtml(mn.name || truncate(mn.pubkey, 12))}
- +
${statusMsg}
`; @@ -441,7 +442,7 @@ card.innerHTML = `
- ${status === 'healthy' ? 'βœ…' : status === 'degraded' ? '⚠️' : '❌'} + ${status === 'healthy' ? '' : status === 'degraded' ? '' : ''} ${escapeHtml(node.name || truncate(pubkey, 16))} β€” ${statusMsg} ${!claimed ? `` : ''}
@@ -543,23 +544,23 @@ } // Render FAQ/checklist (additional Q&A) if (homeCfg?.checklist?.length) { - if (html) html += '

❓ FAQ

'; + if (html) html += '

FAQ

'; html += homeCfg.checklist.map(i => `
${window.miniMarkdown ? miniMarkdown(i.answer) : escapeHtml(i.answer)}
`).join(''); } // Fallback: Bay Area defaults when no config at all if (!html) { const items = [ - { q: 'πŸ’¬ First: Join the Bay Area MeshCore Discord', + { q: ' First: Join the Bay Area MeshCore Discord', a: '

The community Discord is the best place to get help and find local mesh enthusiasts.

Join the Discord β†—

Start with #intro-to-meshcore β€” it has detailed setup instructions.

' }, - { q: 'πŸ”΅ Step 1: Connect via Bluetooth', + { q: ' Step 1: Connect via Bluetooth', a: '

Flash BLE companion firmware from MeshCore Flasher.

  • Screenless devices: default PIN 123456
  • Screen devices: random PIN shown on display
  • If pairing fails: forget device, reboot, re-pair
' }, - { q: 'πŸ“» Step 2: Set the right frequency preset', + { q: ' Step 2: Set the right frequency preset', a: '

US Recommended:

910.525 MHz Β· BW 62.5 kHz Β· SF 7 Β· CR 5

Select "US Recommended" in the app or flasher.

' }, - { q: 'πŸ“‘ Step 3: Advertise yourself', + { q: ' Step 3: Advertise yourself', a: '

Tap the signal icon β†’ Flood to broadcast your node to the mesh. Companions only advert when you trigger it manually.

' }, - { q: 'πŸ” Step 4: Check "Heard N repeats"', + { q: ' Step 4: Check "Heard N repeats"', a: '
  • "Sent" = transmitted, no confirmation
  • "Heard 0 repeats" = no repeater picked it up
  • "Heard 1+ repeats" = you\'re on the mesh!
' }, - { q: 'πŸ“ Repeaters near you?', + { q: ' Repeaters near you?', a: '

Check the network map to see active repeaters.

' } ]; html = items.map(i => `
${i.a}
`).join(''); diff --git a/public/hop-display.js b/public/hop-display.js index c62f0f77..1f775194 100644 --- a/public/hop-display.js +++ b/public/hop-display.js @@ -82,10 +82,10 @@ window.HopDisplay = (function() { const badgeCount = regionalConflicts.length > 0 ? regionalConflicts.length : (globalFallback ? conflicts.length : 0); const conflictData = escapeHtml(JSON.stringify({ h, conflicts, globalFallback })); const conflictBadge = badgeCount > 1 - ? ` ` + ? ` ` : ''; const unreliableBadge = unreliable - ? ' ' + ? ' ' : ''; const warnBadge = conflictBadge + unreliableBadge; @@ -123,20 +123,24 @@ window.HopDisplay = (function() { // #1504 β€” Path symbols legend (shared by Packets + Nodes pages). // Tufte: integrate words and graphics β€” small, on-data, dismissible. - // Glyph strings here MUST match exactly what hop-display.js emits in renderHop() - // (the yellow ⚠N button + the bare ⚠ unreliable button + dashed-underline class). + // PATH_SYMBOLS_LEGEND mirrors what renderHop() emits (yellow warning+N + // button, bare warning button, dashed-underline class). Glyphs are + // pre-rendered Phosphor sprite HTML so the legend visually matches the + // actual hop chrome (#1648 M3). + const WARN_PH = ''; const PATH_SYMBOLS_LEGEND = [ - { glyph: '⚠N', + { glyphHtml: '' + WARN_PH + 'N', description: 'Yellow button next to a hop β€” N regional candidates share this hop\u2019s prefix. Click for the candidate list.' }, - { glyph: '⚠', + { glyphHtml: '' + WARN_PH + '', description: 'Warning icon alone (no number) β€” unreliable name resolution: the best-guess pubkey couldn\u2019t be confirmed against surrounding path hops.' }, - { glyph: 'dashed underline', + { glyphHtml: 'dashed underline', description: 'Ambiguous or global-fallback resolution β€” the name matched outside the current region.' }, ]; function renderPathSymbolsLegend() { const items = PATH_SYMBOLS_LEGEND.map(function(e) { - return '
  • ' + escapeHtml(e.glyph) + ' β€” ' + escapeHtml(e.description) + '
    • '; + // glyphHtml is trusted (constant strings above), description is escaped. + return '
  • ' + e.glyphHtml + ' β€” ' + escapeHtml(e.description) + '
    • '; }).join(''); return '
    Path symbols' + '
      ' + items + '
    '; diff --git a/public/icons/phosphor-sprite.svg b/public/icons/phosphor-sprite.svg index c1d31db6..6472c8b3 100644 --- a/public/icons/phosphor-sprite.svg +++ b/public/icons/phosphor-sprite.svg @@ -3,12 +3,14 @@ + + @@ -33,6 +35,7 @@ + @@ -53,14 +56,17 @@ + + + diff --git a/public/path-inspector.js b/public/path-inspector.js index 6a9caa5f..75e06feb 100644 --- a/public/path-inspector.js +++ b/public/path-inspector.js @@ -119,7 +119,7 @@ html += '' + (i + 1) + ''; html += '' + c.score.toFixed(3) + - (c.speculative ? ' ⚠' : '') + + (c.speculative ? ' ' : '') + ''; html += '' + escapeHtml(c.names.join(' β†’ ')) + ''; html += ''; diff --git a/public/route-view-utils.js b/public/route-view-utils.js index 31cbc92a..db39de86 100644 --- a/public/route-view-utils.js +++ b/public/route-view-utils.js @@ -32,18 +32,24 @@ if (!pktCtx || !pktCtx.type) return ''; var t = pktCtx.type; var d = pktCtx.decoded || {}; + // #1648 M3: payload-type taxonomy glyphs are inline Phosphor sprite refs + // (was: πŸ“‘/πŸ”€/βœ‰/πŸ”’/πŸ”“/βŒ–/#/Β·). // EMOJI-OK: comment referencing prior glyphs var glyph, label, factsHtml = ''; switch (t) { case 'ADVERT': - glyph = 'πŸ“‘'; label = 'ADVERT'; + glyph = ''; label = 'ADVERT'; var name = d.adName || d.name || (d.pubKey ? d.pubKey.slice(0, 8) : '?'); var role = (d.flags && (d.flags.repeater ? 'repeater' : d.flags.room ? 'room' : d.flags.sensor ? 'sensor' : d.flags.chat ? 'companion' : 'unknown')) || 'unknown'; // no fabricated fields. Battery isn't decoded into the advert // JSON β€” adverts carry lat/lon + name + flags, not battery. If a // future advert version exposes it, re-add then. - var sig = (d.signatureValid === true) ? 'βœ“' : (d.signatureValid === false ? 'βœ—' : null); + var sigHtml = (d.signatureValid === true) + ? '' + '' + '' + : (d.signatureValid === false + ? '' + '' + '' + : null); var line1 = '' + escapeHtml(name) + ' Β· ' + escapeHtml(role); - if (sig) line1 += ' Β· sig ' + sig; + if (sigHtml) line1 += ' Β· sig ' + sigHtml; // Self-reported GPS if present if (d.lat != null && d.lon != null) { line1 += ' Β· ' + d.lat.toFixed(3) + ', ' + d.lon.toFixed(3); @@ -53,7 +59,7 @@ if (pkPrefix) factsHtml += '
    ' + escapeHtml(pkPrefix) + '
    '; break; case 'PATH': - glyph = 'πŸ”€'; label = 'PATH'; + glyph = ''; label = 'PATH'; var psrc = pktCtx.srcResolvedName || (d.srcHash ? 'unknown (hash ' + d.srcHash + ')' : '?'); var pdst = pktCtx.destResolvedName || (d.destHash ? 'unknown (hash ' + d.destHash + ')' : '?'); factsHtml = '
    ' + escapeHtml(psrc) + ' β†’ ' + escapeHtml(pdst) + '
    '; @@ -62,21 +68,24 @@ case 'REQ': case 'RESPONSE': case 'ANON_REQ': - var typeGlyphs = { 'TXT_MSG': 'βœ‰', 'REQ': 'πŸ”’', 'RESPONSE': 'πŸ”“', 'ANON_REQ': 'πŸ”’' }; + var typeGlyphNames = { 'TXT_MSG': 'ph-envelope', 'REQ': 'ph-lock', 'RESPONSE': 'ph-lock-open', 'ANON_REQ': 'ph-lock' }; var typeLabels = { 'TXT_MSG': 'DM', 'REQ': 'REQUEST', 'RESPONSE': 'RESPONSE', 'ANON_REQ': 'ANON REQ' }; - glyph = typeGlyphs[t] || 'Β·'; + glyph = (typeGlyphNames[t] ? '' : ''); label = typeLabels[t] || t; var src = pktCtx.srcResolvedName || (d.srcHash ? 'unknown (hash ' + d.srcHash + ')' : (t === 'ANON_REQ' ? 'anon' : '?')); var dst = pktCtx.destResolvedName || (d.destHash ? 'unknown (hash ' + d.destHash + ')' : '?'); factsHtml = '
    ' + escapeHtml(src) + ' β†’ ' + escapeHtml(dst) + '
    '; - factsHtml += '
    πŸ”’ encrypted
    '; + factsHtml += '
    ' + '' + ' encrypted
    '; break; case 'GRP_TXT': case 'CHAN': - glyph = '#'; label = 'CHANNEL MSG'; + glyph = ''; label = 'CHANNEL MSG'; var chName = pktCtx.channelName || d.channel || (d.channelHashHex ? 'channel 0x' + d.channelHashHex : 'channel ?'); var contentText = pktCtx.decryptedText || d.text || d.plainText || null; - var encStatus = contentText ? 'πŸ”“ decrypted' : (d.decryptionStatus === 'decrypted' ? 'πŸ”“ decrypted' : 'πŸ”’ no key'); + var decrypted = !!contentText || d.decryptionStatus === 'decrypted'; + var encStatus = decrypted + ? '' + ' decrypted' + : '' + ' no key'; factsHtml = '
    ' + escapeHtml(chName) + '
    '; factsHtml += '
    ' + encStatus + '
    '; if (contentText) { @@ -88,7 +97,7 @@ if (senderName) factsHtml += '
    from ' + escapeHtml(senderName) + '
    '; break; case 'TRACE': - glyph = 'βŒ–'; label = 'TRACE'; + glyph = ''; label = 'TRACE'; var officialHops = (d.routeTaken && d.routeTaken.length) || (d.route && d.route.length) || null; var observed = (pktCtx.observedHops != null) ? pktCtx.observedHops : null; if (officialHops != null && observed != null) { @@ -99,7 +108,7 @@ if (pktCtx.issuedBy) factsHtml += '
    issued by ' + escapeHtml(pktCtx.issuedBy) + '
    '; break; default: - glyph = 'Β·'; label = (t || 'OTHER').toUpperCase(); + glyph = ''; label = (t || 'OTHER').toUpperCase(); if (pktCtx.payloadSize != null) { factsHtml = '
    ' + pktCtx.payloadSize + ' bytes
    '; } diff --git a/public/route-view.js b/public/route-view.js index 329e71b9..f5e68ac4 100644 --- a/public/route-view.js +++ b/public/route-view.js @@ -134,7 +134,7 @@ var titleTxt = node.multi_byte_status === 'suspected' ? 'Conflicting evidence about this node\u2019s hash-prefix size (multi-byte not confirmed)' : 'No advert sample yet to confirm hash-prefix size'; - suspectedWarn = '⚠ ' + lbl + ''; + suspectedWarn = ' ' + lbl + ''; } var rel = node.last_seen ? relativeTime(node.last_seen) : '–'; var snr = buildSnrSparkline(ana.snrTrend || []); @@ -218,7 +218,13 @@ } function roleGlyph(role) { - return ({repeater:'●', companion:'β– ', room:'β¬’', sensor:'β–²', observer:'β—†'})[role] || 'β—‹'; + // #1648 M3: role shape glyphs β†’ Phosphor sprite refs. + // Map preserves prior visual intent (●→circle-fill, β– β†’square-fill, // EMOJI-OK: comment + // β¬’β†’hexagon, β–²β†’triangle, β—†β†’diamond) and falls back to a hollow circle. // EMOJI-OK: comment + var name = ({ repeater: 'ph-circle-fill', companion: 'ph-square-fill', + room: 'ph-hexagon', sensor: 'ph-triangle', + observer: 'ph-diamond' })[role] || 'ph-circle'; + return ''; } function buildSidebar(positions, mapRef, layer, edges, markers, opts) { @@ -266,14 +272,14 @@ var glyph = roleGlyph(p.role); var name = escapeHtml(p.name || (p.pubkey ? String(p.pubkey).slice(0,8) : '?')); // Show a status badge for unresolved hops: - // - gpsless: node identified but missing GPS β†’ "πŸ“ no GPS" - // - else: couldn't resolve prefix β†’ "πŸ” unknown" + // - gpsless: node identified but missing GPS β†’ no-GPS pin chip + // - else: couldn't resolve prefix β†’ unknown chip var statusBadge = ''; if (p.resolved === false) { if (p.gpsless) { - statusBadge = ' πŸ“ no GPS'; + statusBadge = ' no GPS'; } else { - statusBadge = ' πŸ” unknown'; + statusBadge = ' unknown'; } } // hops derived from the packet's PAYLOAD (sender/recipient @@ -387,7 +393,7 @@ multiPathChip + pathPicker + '
    ' + spark + '
    ' + - '' + + '' + '
    '; // origin row pinned at top, dest at bottom; middle scrollable diff --git a/public/style.css b/public/style.css index 2e698157..a4b7108c 100644 --- a/public/style.css +++ b/public/style.css @@ -18,6 +18,23 @@ flex-shrink: 0; } +/* Status-token color classes (#1648 M3). + * Replace πŸŸ’πŸŸ‘πŸ”΄βšͺ/βœ…βš οΈβŒ emoji dots with Phosphor sprites that inherit + * their color via currentColor. Each class threads the existing + * --status-* color token so dark/light theming continues to work. + * + * Pattern: + * + */ +.status-ok { color: var(--status-green); } +.status-warn { color: var(--status-yellow); } +.status-err { color: var(--status-red); } +.status-muted { color: var(--text-muted, #94a3b8); } +.status-ok .ph-icon, +.status-warn .ph-icon, +.status-err .ph-icon, +.status-muted .ph-icon { fill: currentColor; } + /* Aldrich webfont β€” used by the navbar logo SVG (issue #1137 follow-up). * Self-hosted woff2 (latin subset from Google Fonts, ~16KB). Only weight * available is 400; the SVG's font-weight="700" synthesizes bold. */ diff --git a/test-all.sh b/test-all.sh index 56b2dabb..5741443c 100755 --- a/test-all.sh +++ b/test-all.sh @@ -30,6 +30,7 @@ node test-analytics-channels-integration.js node test-observers-headings.js node test-issue-1648-m1-emoji-scan.js node test-issue-1648-m2-emoji-scan.js +node test-issue-1648-m3-emoji-scan.js node test-traces.js # #1418 β€” route-view v2 (Tufte) coverage diff --git a/test-channels-list-render-e2e.js b/test-channels-list-render-e2e.js index 8224a863..c26e5fcc 100644 --- a/test-channels-list-render-e2e.js +++ b/test-channels-list-render-e2e.js @@ -87,8 +87,9 @@ function assert(c, m) { if (!c) throw new Error(m || 'assertion failed'); } !document.getElementById('chEncryptedBody').hasAttribute('hidden')); const lockBadge = await page.$('.ch-section-encrypted .ch-badge'); assert(lockBadge, 'encrypted section should render badges'); - const txt = await page.textContent('.ch-section-encrypted .ch-badge'); - assert(/πŸ”’/.test(txt), 'encrypted badge should show lock glyph: ' + txt); + // #1648 M3: lock badge is a Phosphor sprite ref (was πŸ”’ emoji) + const html = await page.$eval('.ch-section-encrypted .ch-badge', el => el.innerHTML); + assert(/#ph-lock/.test(html), 'encrypted badge should reference ph-lock sprite: ' + html); }); await step('Network row preview shows last sender:message', async () => { diff --git a/test-frontend-helpers.js b/test-frontend-helpers.js index 03177ad5..b2c373b6 100644 --- a/test-frontend-helpers.js +++ b/test-frontend-helpers.js @@ -2868,7 +2868,7 @@ console.log('\n=== channels.js: encrypted channel without key shows lock message // Should show lock message, NOT fetch messages API const msgEl = dom['chMessages']; - assert.ok(msgEl.innerHTML.includes('πŸ”’'), 'should show lock emoji for encrypted channel without key'); + assert.ok(msgEl.innerHTML.includes('#ph-lock'), 'should show lock sprite for encrypted channel without key'); // #1648 M3 assert.ok(msgEl.innerHTML.includes('no decryption key'), 'should mention no decryption key'); const messageApiFetched = apiCallPaths.some(p => p.indexOf('/messages') !== -1); assert.ok(!messageApiFetched, 'should NOT fetch messages API for encrypted channel without key'); @@ -2967,7 +2967,7 @@ console.log('\n=== channels.js: encrypted channel without key shows lock message includeEncryptedChannels: [{ hash: '#test', name: '#test', messageCount: 3, lastActivity: null, encrypted: null }], storedKey: null, }); - assert.ok(!r.msgHtml.includes('πŸ”’'), 'unencrypted #channel must NOT show lock affordance'); + assert.ok(!r.msgHtml.includes('#ph-lock'), 'unencrypted #channel must NOT show lock affordance'); // #1648 M3 const messageApiFetched = r.apiCallPaths.some(p => p.indexOf('/messages') !== -1); assert.ok(messageApiFetched, 'unencrypted #channel must fetch messages REST endpoint'); }); @@ -2978,7 +2978,7 @@ console.log('\n=== channels.js: encrypted channel without key shows lock message includeEncryptedChannels: [{ hash: '#private', name: '#private', messageCount: 5, lastActivity: null, encrypted: true }], storedKey: null, }); - assert.ok(r.msgHtml.includes('πŸ”’'), 'encrypted #channel without key must show lock affordance'); + assert.ok(r.msgHtml.includes('#ph-lock'), 'encrypted #channel without key must show lock affordance'); // #1648 M3 assert.ok(r.msgHtml.includes('no decryption key'), 'lock should mention no decryption key'); const messageApiFetched = r.apiCallPaths.some(p => p.indexOf('/messages') !== -1); assert.ok(!messageApiFetched, 'must NOT fetch /messages REST for encrypted channel without key'); @@ -6295,7 +6295,7 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ===' }, {}); // Must contain unreliable warning badge button assert.ok(html.includes('hop-unreliable-btn'), 'should have unreliable badge button'); - assert.ok(html.includes('⚠️'), 'should have ⚠️ icon'); + assert.ok(html.includes('#ph-warning'), 'should have ph-warning sprite icon'); // #1648 M3 assert.ok(html.includes('Unreliable name resolution'), 'should have tooltip text'); // Must NOT contain line-through in inline style (CSS class no longer has it) assert.ok(!html.includes('line-through'), 'should not contain line-through'); @@ -6440,7 +6440,9 @@ console.log('\n=== roles.js: Map Tile Config Parsing ==='); test('#1504: each legend entry has glyph + description', () => { HD.PATH_SYMBOLS_LEGEND.forEach((e, i) => { - assert.ok(e && typeof e.glyph === 'string' && e.glyph.length > 0, 'entry ' + i + ' needs non-empty glyph'); + // #1648 M3: glyph β†’ glyphHtml (Phosphor sprite markup), text fallback OK + const g = (e && (e.glyphHtml || e.glyph)) || ''; + assert.ok(typeof g === 'string' && g.length > 0, 'entry ' + i + ' needs non-empty glyph/glyphHtml'); assert.ok(typeof e.description === 'string' && e.description.length > 0, 'entry ' + i + ' needs non-empty description'); }); }); @@ -6454,7 +6456,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ==='); const html = HD.renderPathSymbolsLegend(); assert.ok(html.includes(' element'); assert.ok(html.includes('Path symbols'), 'must have summary text "Path symbols"'); - assert.ok(html.includes('⚠'), 'must contain warning glyph'); + assert.ok(html.includes('#ph-warning') || html.includes('⚠'), 'must contain warning glyph (sprite or unicode)'); // #1648 M3 assert.ok(/dashed/i.test(html), 'must describe the dashed underline convention'); }); @@ -6502,24 +6504,24 @@ console.log('\n=== roles.js: Map Tile Config Parsing ==='); test('#1504: legend glyphs match what hop-display.js actually renders (no documented-but-missing glyphs)', () => { const hopSrc = fs.readFileSync(__dirname + '/public/hop-display.js', 'utf8'); HD.PATH_SYMBOLS_LEGEND.forEach(entry => { - const g = entry.glyph; + // #1648 M3: glyphs are now sprite HTML (glyphHtml); the legend uses + // ph-warning sprite refs which appear inline in hop-display.js too. + const g = entry.glyphHtml || entry.glyph || ''; if (g === 'dashed underline') { - // documented as a CSS convention; class hop-ambiguous uses border-bottom: dashed assert.ok(/hop-ambiguous|hop-global-fallback/.test(hopSrc), 'legend mentions "dashed underline" but hop-display.js has no ambiguous/global-fallback class'); return; } - if (g === '⚠N') { - // Real template literal in hop-display.js: ⚠${badgeCount} - assert.ok(hopSrc.includes('⚠${badgeCount}') || hopSrc.includes('\u26a0${badgeCount}'), - 'legend documents ⚠N but hop-display.js does not emit ⚠${badgeCount}'); + // Sprite legend entries reference ph-warning; hop-display.js must + // also reference ph-warning (it's what renderHop emits). + if (/ph-warning/.test(g)) { + assert.ok(/ph-warning/.test(hopSrc), + 'legend uses ph-warning sprite but hop-display.js does not reference it'); return; } // Otherwise the literal glyph must appear in the file assert.ok(hopSrc.includes(g), - 'legend glyph ' + JSON.stringify(g) + ' (codepoints ' + - [...g].map(c => 'U+' + c.codePointAt(0).toString(16).toUpperCase()).join(',') + - ') not found in hop-display.js'); + 'legend glyph ' + JSON.stringify(g.slice(0, 60)) + ' not found in hop-display.js'); }); }); diff --git a/test-issue-1648-m3-emoji-scan.js b/test-issue-1648-m3-emoji-scan.js new file mode 100644 index 00000000..0767602e --- /dev/null +++ b/test-issue-1648-m3-emoji-scan.js @@ -0,0 +1,169 @@ +#!/usr/bin/env node +/* Issue #1648 β€” M3: emoji β†’ Phosphor sprite migration (static scan). + * + * M3 covers detail panes, status pills, role/payload-type badges: + * home.js, channels.js, route-view-utils.js, route-view.js, + * app.js, hop-display.js, path-inspector.js + * + * Asserts (per file): + * 1. Zero UI-iconography codepoints (U+1F300–1FAFF, U+2600–27BF, and + * Misc-Symbols: β—†β—β– β–²β˜…β˜†β—‹βœ“βœ—βš βœ‰) outside an allowlist of contexts that are + * not UI iconography (CSS comments, JS comments referencing prior + * glyphs, console.log/debug strings, and explicitly tagged + * // EMOJI-OK lines). + * 2. At least N !txt.includes(`id="${id}"`)); + if (missing.length) throw new Error(`sprite missing M3 symbols: ${missing.join(', ')}`); +} + +function assertStatusTokenCss() { + const css = fs.readFileSync(path.join(ROOT, 'style.css'), 'utf8'); + const needed = ['.status-ok', '.status-warn', '.status-err', '.status-muted']; + const missing = needed.filter(sel => !new RegExp(sel.replace('.', '\\.') + '\\b').test(css)); + if (missing.length) throw new Error(`style.css missing status-token rules: ${missing.join(', ')}`); + // Each must thread a --status-* var via color + const block = css.match(/\.status-ok[\s\S]{0,400}\}/); + if (!block || !/var\(--status-/.test(block[0])) { + throw new Error('.status-ok rule must set color via var(--status-*)'); + } +} + +function main() { + let failed = 0; + console.log('β€” Issue #1648 M3 β€” emoji/misc-icon scan'); + + try { + assertSpriteHasM3Icons(); + console.log(' βœ“ sprite has required M3 symbols'); + } catch (e) { + console.error(` βœ— ${e.message}`); + failed++; + } + + try { + assertStatusTokenCss(); + console.log(' βœ“ style.css has .status-{ok,warn,err,muted} threading var(--status-*)'); + } catch (e) { + console.error(` βœ— ${e.message}`); + failed++; + } + + for (const rel of M3_FILES) { + const hits = scanFile(rel); + if (hits.length === 0) { + console.log(` βœ“ ${rel} clean (no emoji / misc-icon iconography)`); + } else { + console.error(` βœ— ${rel} has ${hits.length} emoji/misc-icon hit(s):`); + for (const h of hits.slice(0, 30)) console.error(` ${h.file}:${h.line} [${h.kind}] ${h.text}`); + if (hits.length > 30) console.error(` … (+${hits.length - 30} more)`); + failed++; + } + const useRefs = countUseRefs(rel); + const min = MIN_USE_REFS[rel] || 1; + if (useRefs < min) { + console.error(` βœ— ${rel} has only ${useRefs} refs (expected β‰₯${min})`); + failed++; + } else { + console.log(` βœ“ ${rel} has ${useRefs} Phosphor refs (β‰₯${min})`); + } + assert.strictEqual(hits.length, 0, + `${rel} must contain zero emoji/misc-icon iconography (got ${hits.length} hit(s))`); + assert.ok(useRefs >= min, + `${rel} must have β‰₯${min} refs (got ${useRefs})`); + } + + if (failed) { + console.error(`\nFAIL: ${failed} M3 check(s) failed`); + process.exit(1); + } + console.log('\nPASS: all M3 surfaces icon-free and Phosphor-swapped'); +} + +main(); diff --git a/test-issue-1648-m3-icons-e2e.js b/test-issue-1648-m3-icons-e2e.js new file mode 100644 index 00000000..73cf19b7 --- /dev/null +++ b/test-issue-1648-m3-icons-e2e.js @@ -0,0 +1,188 @@ +#!/usr/bin/env node +/* Issue #1648 β€” M3: emoji β†’ Phosphor sprite migration (E2E behavioral). + * + * Asserts (in a real Chromium against a running server): + * (a) /home welcome cards render Phosphor icons (chooser, FAQ heading, + * step glyphs) and the rendered DOM has zero emoji codepoints. + * (b) /channels modal title/help renders Phosphor sprites (no πŸ’¬ / πŸ”’ + * emoji in modal chrome). + * (c) /nodes/ detail pane β€” at minimum, sprite refs render + * and no .notdef glyphs leak through. + * (d) /analytics page renders sprite refs (M2+M3 surfaces combined). + * (e) /live page renders sprite refs. + * (f) NO .notdef glyph anywhere β€” every resolves to a defined + * sprite symbol id. + * (g) The .status-{ok,warn,err,muted} rules in style.css resolve to + * actual --status-* color values (computed color reflects token). + * + * CI gating: CHROMIUM_REQUIRE=1 makes Chromium-launch failure a HARD FAIL. + */ +'use strict'; + +const { chromium } = require('playwright'); +const assert = require('assert'); + +const BASE = process.env.BASE_URL || 'http://localhost:13581'; +const EMOJI_RE = /[\u{1F300}-\u{1FAFF}\u{2600}-\u{27BF}β—†β—β– β–²β˜…β˜†β—‹βœ“βœ—βš βœ‰]/u; + +let passes = 0, failures = 0; +function pass(msg) { console.log(` βœ“ ${msg}`); passes++; } +function fail(msg) { console.error(` βœ— ${msg}`); failures++; } + +async function spriteRefsResolve(page, label, min) { + min = min || 1; + const r = await page.evaluate(() => { + const uses = Array.from(document.querySelectorAll('svg.ph-icon use')); + return { + count: uses.length, + refs: uses.slice(0, 5).map(u => u.getAttribute('href') || u.getAttribute('xlink:href') || ''), + }; + }); + if (r.count < min) fail(`${label}: only ${r.count} sprite refs (expected β‰₯${min})`); + else pass(`${label}: ${r.count} sprite refs (β‰₯${min})`); +} + +async function noEmojiInRender(page, route, label) { + await page.goto(`${BASE}/#${route}`, { waitUntil: 'domcontentloaded' }); + await page.waitForFunction(() => !!document.querySelector('#app'), + null, { timeout: 8000 }).catch(() => {}); + // Give the SPA a tick to render + await page.waitForTimeout(400); + const txt = await page.evaluate(() => (document.getElementById('app') || document.body).textContent || ''); + if (EMOJI_RE.test(txt)) { + const sample = txt.match(EMOJI_RE); + fail(`${label}: rendered DOM contains emoji (sample: ${JSON.stringify(sample && sample[0])})`); + } else { + pass(`${label}: rendered DOM is emoji-free`); + } +} + +async function main() { + const requireChromium = process.env.CHROMIUM_REQUIRE === '1'; + let browser; + try { + browser = await chromium.launch({ + headless: true, + executablePath: process.env.CHROMIUM_PATH || undefined, + args: ['--no-sandbox', '--disable-gpu', '--disable-dev-shm-usage'], + }); + } catch (err) { + if (requireChromium) { + console.error(`test-issue-1648-m3-icons-e2e.js: HARD FAIL β€” Chromium unavailable: ${err.message}`); + process.exit(1); + } + console.warn(`SKIP β€” Chromium unavailable: ${err.message}`); + process.exit(0); + } + + const ctx = await browser.newContext({ viewport: { width: 1280, height: 900 } }); + const page = await ctx.newPage(); + + // (a) /home welcome cards + await noEmojiInRender(page, '/home', '(a) /home'); + // /home should render at least the chooser/onboard sprites + const home = await page.evaluate(() => { + return { + uses: Array.from(document.querySelectorAll('svg.ph-icon use')) + .map(u => (u.getAttribute('href') || '').replace(/^.*#/, '')), + hasChooser: !!document.querySelector('.chooser-icon, .onboard-icon, .home-footer-link'), + }; + }); + if (!home.hasChooser) fail('(a) /home: chooser/onboard elements missing'); + else pass('(a) /home: chooser/onboard surfaces present'); + if (home.uses.length === 0) fail('(a) /home: no sprite refs rendered'); + else pass(`(a) /home: ${home.uses.length} sprite refs (sample: ${home.uses.slice(0,4).join(',')})`); + + // (b) /channels modal + sidebar + await page.goto(`${BASE}/#/channels`, { waitUntil: 'domcontentloaded' }); + await page.waitForTimeout(600); + const channels = await page.evaluate(() => { + return { + sidebarText: (document.querySelector('.ch-sidebar-title') || {}).textContent || '', + sidebarSprites: (document.querySelectorAll('.ch-sidebar-title svg.ph-icon') || []).length, + bodyText: (document.getElementById('app') || document.body).textContent || '', + allSprites: document.querySelectorAll('svg.ph-icon use').length, + }; + }); + if (EMOJI_RE.test(channels.sidebarText)) fail('(b) /channels: sidebar title still has emoji'); + else pass('(b) /channels: sidebar title is emoji-free'); + if (channels.sidebarSprites === 0) fail('(b) /channels: sidebar title has no sprite icon'); + else pass(`(b) /channels: sidebar title has ${channels.sidebarSprites} sprite(s)`); + if (channels.allSprites === 0) fail('(b) /channels: zero sprite refs on page'); + else pass(`(b) /channels: ${channels.allSprites} sprite refs on page`); + + // (c) /nodes detail β€” fetch one pubkey from /api/nodes + const pk = await page.evaluate(async () => { + try { + const r = await fetch('/api/nodes?limit=1'); + const j = await r.json(); + const list = j.nodes || j.data || j || []; + const n = Array.isArray(list) ? list[0] : null; + return n && (n.public_key || n.pubkey || n.pubKey) || null; + } catch { return null; } + }); + if (!pk) { + console.warn(' ⚠ (c) /nodes/: no node from API; falling back to /nodes list page'); + await noEmojiInRender(page, '/nodes', '(c) /nodes'); + } else { + await page.goto(`${BASE}/#/nodes/${pk}`, { waitUntil: 'domcontentloaded' }); + await page.waitForTimeout(800); + await spriteRefsResolve(page, '(c) /nodes/ sprite refs', 1); + } + + // (d) /analytics β€” exercise multiple tabs casually + await noEmojiInRender(page, '/analytics', '(d) /analytics'); + await spriteRefsResolve(page, '(d) /analytics sprite refs', 5); + + // (e) /live + await page.goto(`${BASE}/#/live`, { waitUntil: 'domcontentloaded' }); + await page.waitForTimeout(600); + await spriteRefsResolve(page, '(e) /live sprite refs', 3); + + // (f) No .notdef anywhere β€” every resolves to a defined symbol id. + const undef = await page.evaluate(async () => { + const resp = await fetch('/icons/phosphor-sprite.svg').catch(() => null); + if (!resp || !resp.ok) return { error: 'sprite fetch failed' }; + const text = await resp.text(); + const ids = new Set(); + for (const m of text.matchAll(/id="(ph-[a-z-]+)"/g)) ids.add(m[1]); + const uses = Array.from(document.querySelectorAll('svg.ph-icon use')); + const missing = []; + for (const u of uses) { + const href = u.getAttribute('href') || u.getAttribute('xlink:href') || ''; + const m = href.match(/#(ph-[a-z-]+)/); + if (!m) { missing.push(href); continue; } + if (!ids.has(m[1])) missing.push(m[1]); + } + return { count: uses.length, ids: ids.size, missing }; + }); + if (undef.error) fail(`(f) sprite fetch: ${undef.error}`); + else if (undef.missing && undef.missing.length) fail(`(f) ${undef.missing.length} sprite ref(s) not resolved: ${undef.missing.slice(0,5).join(', ')}`); + else pass(`(f) all ${undef.count} sprite refs resolve to one of ${undef.ids} defined symbols`); + + // (g) status-token CSS resolves to a real color + await page.goto(`${BASE}/#/home`, { waitUntil: 'domcontentloaded' }); + await page.waitForTimeout(200); + const status = await page.evaluate(() => { + const probe = document.createElement('span'); + probe.className = 'status-ok'; + probe.style.position = 'absolute'; probe.style.left = '-9999px'; + document.body.appendChild(probe); + const cs = getComputedStyle(probe); + const color = cs.color; + probe.remove(); + return color; + }); + if (!/rgb/.test(status)) fail(`(g) .status-ok did not resolve to an rgb color (got "${status}")`); + else pass(`(g) .status-ok resolves to ${status} (currentColor token threaded)`); + + await browser.close(); + console.log(`\ntest-issue-1648-m3-icons-e2e.js: ${passes} passed, ${failures} failed`); + assert.strictEqual(failures, 0, `${failures} M3 icon-render assertions failed`); + process.exit(0); +} + +main().catch((err) => { + console.error('test-issue-1648-m3-icons-e2e.js: FAIL β€”', err); + process.exit(1); +});