From d32014c3ea44f22e6428a028e1d43a21bb7c8e2a Mon Sep 17 00:00:00 2001 From: Outis Date: Tue, 11 Aug 2026 18:09:48 -0400 Subject: [PATCH] Add sourced sing-along tune fixes --- services/drum-rhythm-game.sh | 164 +++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/services/drum-rhythm-game.sh b/services/drum-rhythm-game.sh index 9d467c6..3dd3ebf 100644 --- a/services/drum-rhythm-game.sh +++ b/services/drum-rhythm-game.sh @@ -235,6 +235,170 @@ install_drum-rhythm-game() { || { log_error "Clone failed — check network and git access"; return 1; } fi + # Apply local runtime fixes for the upstream single-page game. The game is + # intentionally static, so we patch index.html after clone/pull instead of + # forking the deployment source. The shim is defensive: it fixes Web Audio + # resume/unlock behavior, guarantees every visible drum pad has an audible + # fallback, and replaces Christmas melody metadata with well-known public + # domain tunes using MIDI pitches. + log_info "Applying drum-rhythm-game Christmas/audio fixes..." + cat > "$DRUM_DIR/html/ubuntu-post-install-fixes.js" <<'DRUM_FIXES_JS' +(() => { + 'use strict'; + + const NOTE_TO_MIDI = { C: 0, D: 2, E: 4, F: 5, G: 7, A: 9, B: 11 }; + // Sourced tune corrections. Do not add songs here from memory: every + // melody/rhythm entry must point at a reproducible score/ABC source. + // The first properly sourced passes cover Christmas songs from Milwaukee + // Irish Fest School of Music and Sing Along songs from abcnotation.com. + const CATEGORY_TUNES = { + 'jingle bells': { + title: 'Jingle Bells', bpm: 112, + source: 'Milwaukee Irish Fest School of Music ABC notation PDF: https://irishfestschoolofmusic.com/School-of-Music/Tunes/ifsm-polkas-xmas-jinglebells-abc.pdf', + sourceAbc: '|: BB B2 | BB B2 | Bd GA | B4 | |cc c>c|cB B>B |[1 BA AB | A2 d2 :|[2 dd cA | G2- G2 || DB AG | D2- DD/D/ | DB AG | E2- EE/E/ | Ec BA | F2- FA/A/ | dd cA | B4 | DB AG | D2 DD/D/| DB AG | E2- EE/E/ | Ec BA | dd dd/d/ | ed cA | G2 d2|]', + // Source metadata: M:2/4, L:1/8, K:Gmaj. Repeats/endings are expanded + // explicitly below so the game receives deterministic note events. + melody: 'B4 B4 B4 B4 B4 B4 B4 B4 B4 D5 G4 A4 B4 C5 C5 C5 C5 C5 B4 B4 B4 B4 A4 A4 A4 B4 A4 D5 B4 B4 B4 B4 B4 B4 B4 B4 B4 D5 G4 A4 B4 C5 C5 C5 C5 C5 B4 B4 B4 B4 D5 D5 C5 A4 G4', + beats: '1 1 2 1 1 2 1 1 1 1 4 1 1 1.5 0.5 1 1.5 0.5 1 1 1 1 2 2 1 1 1 4 1 1 1 1 1 2 1 1 1 1 4 1 1 1.5 0.5 1 1.5 0.5 1 1 1 1 1 1 1 1 4' + }, + 'deck the halls': { + title: 'Deck The Halls', bpm: 128, + source: 'Milwaukee Irish Fest School of Music ABC notation PDF: https://irishfestschoolofmusic.com/School-of-Music/Tunes/ifsm-xmas-deckthehalls-abc.pdf', + sourceAbc: '|: d3 c B2 A2 | G2 A2 B2 G2 | ABcA B3 A | G2 F2 G4 :| |A3 B c2 A2 |B3 c d2 A2 | Bc d2 ef g2 |f2 e2 d4 |d3 c B2 A2 | G2 A2 B2 G2 |ABcA B3 A | G2 F2 G4|]', + melody: 'D5 C5 B4 A4 G4 A4 B4 G4 A4 B4 C5 A4 B4 A4 G4 F#4 G4 D5 C5 B4 A4 G4 A4 B4 G4 A4 B4 C5 A4 B4 A4 G4 F#4 G4 A4 B4 C5 A4 B4 C5 D5 A4 B4 C5 D5 E5 F#5 G5 F#5 E5 D5 D5 C5 B4 A4 G4 A4 B4 G4 A4 B4 C5 A4 B4 A4 G4 F#4 G4', + beats: '3 1 2 2 2 2 2 2 1 1 1 1 3 1 2 2 4 3 1 2 2 2 2 2 2 1 1 1 1 3 1 2 2 4 3 1 2 2 3 1 2 2 1 1 2 1 1 2 2 2 4 3 1 2 2 2 2 2 2 1 1 1 1 3 1 2 2 4' + }, + 'we wish you a merry christmas': { + title: 'We Wish You a Merry Christmas', bpm: 108, + source: 'Milwaukee Irish Fest School of Music ABC notation PDF: https://irishfestschoolofmusic.com/School-of-Music/Tunes/ifsm-waltz-xmas-wewishyouamerrychristmas-abc.pdf', + sourceAbc: 'D2 ||G2 GA GF| E2 E2 E2|A2 AB AG |F2 D2 D2| |B2 Bc BA | G2 E2 DD | E2 A2 F2 | G4 D2|| |G2 G2 G2 | F4 F2 | G2 F2 E2 | D4 A2 | |B2 A2 GG | d2 D2 DD | E2 A2 F2 | G4 D2 |]', + melody: 'D4 G4 G4 A4 G4 F#4 E4 E4 E4 A4 A4 B4 A4 G4 F#4 D4 D4 B4 B4 C5 B4 A4 G4 E4 D4 D4 E4 A4 F#4 G4 D4 G4 G4 G4 F#4 F#4 G4 F#4 E4 D4 A4 B4 A4 G4 G4 D5 D4 D4 E4 A4 F#4 G4 D4', + beats: '2 2 1 1 1 1 2 2 2 2 1 1 1 1 2 2 2 2 1 1 1 1 2 2 1 1 2 2 2 4 2 2 2 2 4 2 2 2 2 4 2 2 2 1 1 2 2 1 1 2 2 4 2' + }, + 'twinkle twinkle little star': { + title: 'Twinkle, Twinkle, Little Star', bpm: 96, + source: 'abcnotation.com tune page from the John Chambers abc collection: https://abcnotation.com/tunePage?a=trillian.mit.edu%2F~jc%2Fmusic%2Fabc%2Fmirror%2Fgulfweb.net%3A34043%2F~rlwalker%2Fabc%2Ftwinkle%2F0000', + sourceAbc: '|"D"D D A A|"G"B B "D"A2|"G"G G "D"F F|"A"E/2E/2E/2E/2 "D"D2|"D"A A "G"G G|"D"F F "A"E2|"D"A A "G"G G|"D"F F "A"E2|"D"D D A A|"G"B B "D"A2|"G"G G "D"F F|"A"E/2E/2E/2E/2 "D"D2|]', + // Source metadata: M:4/4, L:1/4, K:D. F notes are raised for K:D. + melody: 'D4 D4 A4 A4 B4 B4 A4 G4 G4 F#4 F#4 E4 E4 E4 E4 D4 A4 A4 G4 G4 F#4 F#4 E4 A4 A4 G4 G4 F#4 F#4 E4 D4 D4 A4 A4 B4 B4 A4 G4 G4 F#4 F#4 E4 E4 E4 E4 D4', + beats: '1 1 1 1 1 1 2 1 1 1 1 0.5 0.5 0.5 0.5 2 1 1 1 1 1 1 2 1 1 1 1 1 1 2 1 1 1 1 1 1 2 1 1 1 1 0.5 0.5 0.5 0.5 2' + }, + 'mary had a little lamb': { + title: 'Mary had a little lamb', bpm: 108, + source: 'abcnotation.com tune page from the John Chambers/Musica Viva mirror: https://abcnotation.com/tunePage?a=trillian.mit.edu%2F~jc%2Fmusic%2Fabc%2Fmirror%2Fmusicaviva.com%2Fengland%2Fmary-had-a-little-lamb-f%2F0000', + sourceAbc: 'AGFG|AAA2|GGG2|AAA2|AGFG|AAAA|GGAG|F4|]', + melody: 'A4 G4 F4 G4 A4 A4 A4 G4 G4 G4 A4 A4 A4 A4 G4 F4 G4 A4 A4 A4 A4 G4 G4 A4 G4 F4', + beats: '1 1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1 1 1 1 1 1 1 1 4' + }, + 'row row row your boat': { + title: 'Row, row, row your boat', bpm: 100, + source: 'abcnotation.com tune page from the John Chambers/Musica Viva mirror: https://abcnotation.com/tunePage?a=trillian.mit.edu%2F~jc%2Fmusic%2Fabc%2Fmirror%2Fmusicaviva.com%2Fengland%2Frow-row-c%2Frow-row-c-c24%2F0000', + sourceAbc: 'C3 C3|C2D E3|E2D E2F|G6|ccc GGG|EEE CCC|G2F E2D|C6:|', + melody: 'C4 C4 C4 D4 E4 E4 D4 E4 F4 G4 C5 C5 C5 G4 G4 G4 E4 E4 E4 C4 C4 C4 G4 F4 E4 D4 C4', + beats: '3 3 2 1 3 2 1 2 1 6 1 1 1 1 1 1 1 1 1 1 1 1 2 1 2 1 6' + }, + 'old macdonald': { + title: 'Old Mac Donald', bpm: 140, + source: 'abcnotation.com tune page from the John Chambers/Musica Viva mirror: https://abcnotation.com/tunePage?a=trillian.mit.edu%2F~jc%2Fmusic%2Fabc%2Fmirror%2Fmusicaviva.com%2Fengland%2Fold-mac-donald-f%2Fold-mac-donald-f-1%2F0000', + sourceAbc: '"F"FFFC|"Bb"DD"F"C2|"G7"AA"C7"GG|"F"F2 z C|"F"FFFC|"Bb"DD"F"C2|"G7"AA"C7"GG|"F"F2 z2|]', + melody: 'F4 F4 F4 C4 D4 D4 C4 A4 A4 G4 G4 F4 R C4 F4 F4 F4 C4 D4 D4 C4 A4 A4 G4 G4 F4 R', + beats: '1 1 1 1 1 1 2 1 1 1 1 2 1 1 1 1 1 1 1 1 2 1 1 1 1 2 2' + } + }; + + const toMidi = (note) => { + if (!note || note === 'R') return null; + const match = /^([A-G])([#b]?)(-?\d+)$/.exec(note); + if (!match) return null; + const accidental = match[2] === '#' ? 1 : match[2] === 'b' ? -1 : 0; + return 12 * (Number(match[3]) + 1) + NOTE_TO_MIDI[match[1]] + accidental; + }; + const freq = (midi) => 440 * (2 ** ((midi - 69) / 12)); + const tuneNotes = (tune) => { + const notes = tune.melody.split(/\s+/); + const beats = tune.beats.split(/\s+/); + return notes.map((note, idx) => { + const midi = toMidi(note); + return { note, midi, frequency: midi == null ? 0 : freq(midi), beat: Number(beats[idx] || 1) }; + }); + }; + + const findAudioContext = () => { + const AudioCtor = window.AudioContext || window.webkitAudioContext; + return AudioCtor ? safeObjectValues(window).find((value) => value instanceof AudioCtor) : null; + }; + const unlock = () => { + const AudioCtor = window.AudioContext || window.webkitAudioContext; + window.__drumRhythmAudioContext = window.__drumRhythmAudioContext || (AudioCtor ? new AudioCtor() : null); + [window.__drumRhythmAudioContext, findAudioContext()].filter(Boolean).forEach((ctx) => ctx.state === 'suspended' && ctx.resume()); + }; + ['pointerdown', 'keydown', 'gamepadconnected', 'touchstart', 'click'].forEach((eventName) => window.addEventListener(eventName, unlock, { passive: true })); + + const padSound = (index = 0) => { + unlock(); + const ctx = window.__drumRhythmAudioContext; + if (!ctx) return; + const now = ctx.currentTime; + const osc = ctx.createOscillator(); + const gain = ctx.createGain(); + osc.type = ['sine', 'triangle', 'square', 'sawtooth'][index % 4]; + osc.frequency.setValueAtTime([110, 146.83, 196, 246.94, 329.63, 392][index % 6], now); + gain.gain.setValueAtTime(0.24, now); + gain.gain.exponentialRampToValueAtTime(0.001, now + 0.13); + osc.connect(gain).connect(ctx.destination); + osc.start(now); + osc.stop(now + 0.14); + }; + window.ubuntuPostInstallDrumPadSound = padSound; + + document.addEventListener('pointerdown', (event) => { + const pad = event.target.closest('[data-pad], .pad, .drum-pad, button'); + if (!pad || /play|start|stop|pause|song/i.test(pad.textContent || '')) return; + padSound([...document.querySelectorAll('[data-pad], .pad, .drum-pad, button')].indexOf(pad)); + }, true); + + const normalize = (name) => String(name || '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim(); + const safeObjectValues = (object) => Object.keys(object).flatMap((key) => { + try { + return [object[key]]; + } catch (_error) { + return []; + } + }); + const safeWindowObjects = () => safeObjectValues(window).filter((value) => value && typeof value === 'object'); + const patchSongs = () => { + for (const root of [window, ...safeWindowObjects()]) { + for (const key of Object.keys(root)) { + let list; + try { + list = root[key]; + } catch (_error) { + continue; + } + if (!Array.isArray(list)) continue; + for (const song of list) { + const title = normalize(song && (song.title || song.name)); + const tuneKey = Object.keys(CATEGORY_TUNES).find((candidate) => title.includes(candidate)); + if (!tuneKey) continue; + const tune = CATEGORY_TUNES[tuneKey]; + song.title = song.title || tune.title; + song.name = song.name || tune.title; + song.bpm = tune.bpm; + song.notes = tuneNotes(tune); + song.melody = tune.melody; + song.beats = tune.beats; + } + } + } + }; + window.addEventListener('load', () => { unlock(); patchSongs(); setTimeout(patchSongs, 250); }); + setInterval(patchSongs, 2000); +})(); +DRUM_FIXES_JS + if [ -f "$DRUM_DIR/html/index.html" ] && ! grep -q "ubuntu-post-install-fixes.js" "$DRUM_DIR/html/index.html"; then + sed -i 's## \n#' "$DRUM_DIR/html/index.html" + fi + chown -R "$ACTUAL_USER:$ACTUAL_USER" "$DRUM_DIR/html" # Mirrors configure_caddy_for_service's own mode resolution (lib/common.sh):