diff options
| author | srdusr <[email protected]> | 2026-01-14 22:23:00 +0200 |
|---|---|---|
| committer | srdusr <[email protected]> | 2026-01-14 22:23:00 +0200 |
| commit | 4933f669f8338ca5e4c64cf0294818c5d15ed122 (patch) | |
| tree | 979ce6ffed0a4a59f65f47252ce9824a77be760e /web/src/app.js | |
| parent | 695bf0df2ec48e67d716dad25711cdc2e96bf7f4 (diff) | |
| download | typerpunk-4933f669f8338ca5e4c64cf0294818c5d15ed122.tar.gz typerpunk-4933f669f8338ca5e4c64cf0294818c5d15ed122.zip | |
Make every passage long enough to be worth timing, and credit all of them
The dataset's median passage was 69 characters, about twelve words, which is
over in twelve seconds at an ordinary speed. Some packs were worse: shell had
a median of 46 and a shortest entry of 17. That is the reason packs felt
small. It was not the number of entries, which was 15 to 37 per pack, but the
length of each one.
Multiplayer had already hit this and worked around it: load_race_texts
filters to 120 characters or more. That filter left only 61 of 350 passages
eligible, 38 of them from two packs, so races repeated constantly and four
packs could never come up at all.
Both halves are fixed.
Content: 104 longer passages added across every pack. The command packs get
whole pipelines rather than single flags, which is how the tools are actually
used and what the explanations were always for. Prose packs get passages that
run 150 to 320 characters.
Selection: a floor of 120 characters. Prose packs draw from their long
entries where a pack holds at least five, so no pack is reduced to the same
few passages. The command packs chain consecutive entries into one drill,
which is the natural shape for them, and the explanations are collected so
each line is still described.
Measured over 400 draws per pack, every category now runs a median of 146 to
218 characters with a shortest draw of 120. The race pool went from 61 of 350
to 130 of 454.
Attribution: 24 passages had none and displayed nothing at all under the
text. They now say Unknown, which is the honest answer for a fact written for
the pack, and the pangram is credited as one. The results and typing screens
both fall back to Unknown rather than rendering an empty line, and the pack
name is shown beside the source.
Multiplayer results, three fixes:
- PB never appeared. A race has no mode of its own, so modeKey was undefined,
so recordResult never ran. Races share one key, because the passage is
whatever the server dealt and a per-passage best would never be beaten.
- Play Again started a solo test. A race carries standings and a solo run does
not, so the results screen can tell them apart and now queues for another
race. The end screen's own cleanup leaves the old room first.
- CONSISTENCY was the longest label on the screen and made the accuracy
column wider than the WPM column opposite it. It reads CON.
RaceText carries the pack name so the results can show it for a race the same
way single player does.
24 Rust tests and 3 browser tests pass.
Diffstat (limited to 'web/src/app.js')
| -rw-r--r-- | web/src/app.js | 71 |
1 files changed, 69 insertions, 2 deletions
diff --git a/web/src/app.js b/web/src/app.js index 123ad6f..923d122 100644 --- a/web/src/app.js +++ b/web/src/app.js @@ -18,6 +18,7 @@ import { saveDocument, setPosition, getDocument, listDocuments, removeDocument } import { getSettings } from './settings.js'; import { generateWordStream, generateWeakKeyStream, wordCountForDuration } from './wordGenerator.js'; import { getWeakChars } from './keyStats.js'; +import { mountTopAdBanner } from './adSlot.js'; const FALLBACK_TEXT = { category: 'general', content: 'The quick brown fox jumps over the lazy dog.', attribution: 'Traditional pangram' }; @@ -31,9 +32,61 @@ function pickRandom(arr) { return arr[Math.floor(Math.random() * arr.length)]; } +// A test that ends in twelve seconds measures nothing. The dataset holds a +// lot of single-sentence entries - a 22 character quote, a 17 character +// shell command - and picking one at random produced exactly that. +const MIN_TEST_CHARS = 120; + +// Packs where several entries in a row make a better exercise than one. A +// drill of three commands is how these are actually used, and each keeps its +// own explanation. +const CHAINED_CATEGORIES = new Set(['shell', 'sysadmin', 'programming', 'hacking']); + +// Enough long entries in a pack to insist on one. Below this the pack simply +// has not got the material, and a short passage beats no passage. +const ENOUGH_LONG = 5; + function getRandomTextItem(items, category) { const pool = category && category !== 'random' ? items.filter(t => t.category === category) : items; - return pool.length ? pickRandom(pool) : FALLBACK_TEXT; + if (!pool.length) return FALLBACK_TEXT; + + if (CHAINED_CATEGORIES.has(category)) return chainShortItems(pool); + + // Prefer a passage worth timing, but only where the pack has enough of + // them that the same few would not come up every session. + const long = pool.filter(t => (t.content || '').length >= MIN_TEST_CHARS); + return pickRandom(long.length >= ENOUGH_LONG ? long : pool); +} + +/// Joins consecutive entries from a pack until the result is long enough to +/// be worth timing. Attributions and explanations are collected so the +/// results screen can still say what each line was. +function chainShortItems(pool) { + const first = pickRandom(pool); + if ((first.content || '').length >= MIN_TEST_CHARS) return first; + + const chosen = [first]; + const remaining = pool.filter(t => t !== first); + let total = (first.content || '').length; + while (total < MIN_TEST_CHARS && remaining.length) { + const next = remaining.splice(Math.floor(Math.random() * remaining.length), 1)[0]; + chosen.push(next); + total += (next.content || '').length + 1; + } + + const attributions = [...new Set(chosen.map(t => t.attribution).filter(Boolean))]; + const explanations = chosen + .map(t => (t.explanation ? `${t.attribution || ''}${t.attribution ? ': ' : ''}${t.explanation}` : null)) + .filter(Boolean); + return { + category: first.category, + // One line, because the typing input is one line. A space between + // commands keeps each one readable and typable as written. + content: chosen.map(t => t.content).join(' '), + attribution: attributions.join(', ') || 'Unknown', + language: first.language, + explanation: explanations.join('\n\n') || undefined, + }; } export function startApp(root, localTexts) { @@ -44,6 +97,7 @@ export function startApp(root, localTexts) { let session = { type: 'random', customIndex: 0 }; let game = null; let cleanupScreen = null; + const adBanner = mountTopAdBanner(); // Approved community submissions, merged on top of the bundled dataset. // Best-effort: the app is fully usable on the packs it ships with, so a @@ -91,6 +145,7 @@ export function startApp(root, localTexts) { function setScreen(name, costly = () => false) { currentScreenName = name; escapeIsCostly = costly; + adBanner.setScreen(name); } function handleGlobalEscape(e) { @@ -296,6 +351,7 @@ export function startApp(root, localTexts) { teardown(); let content; let attribution; + let category; let explanation; let language; let progress; @@ -338,6 +394,9 @@ export function startApp(root, localTexts) { const item = getRandomTextItem(allTexts, selectedCategory); content = item.content; attribution = item.attribution; + // Shown under the passage when it has no attribution of its own, + // so the results always say where the text came from. + category = item.category; // Code snippets highlight themselves; prose packs have no language // and fall through as plain text. language = item.language || undefined; @@ -358,6 +417,7 @@ export function startApp(root, localTexts) { game, text: content, attribution, + category, explanation, language, progress, @@ -401,9 +461,16 @@ export function startApp(root, localTexts) { } teardown(); setScreen('end'); + // A race carries standings; a solo run does not. Play Again used to + // call startGame() either way, so finishing a race and asking to play + // again dropped you into a single player test on your own. Going back + // through showMultiplayer queues for another race. The end screen's + // own cleanup calls onLeaveRace, so the old room is left before the + // next one is joined. + const wasRace = Array.isArray(result.standings) && result.standings.length > 0; cleanupScreen = renderEndScreen(root, { ...result, - onPlayAgain: playAgain, + onPlayAgain: wasRace ? showMultiplayer : playAgain, onMainMenu: showMainMenu, onShowStats: showStats, onShowPlaceholder: showPlaceholder, |