BlueGit

projects-timfalken-com microchess

Bust static asset caches with the deploy commit hash.

Deploy writes web/asset-version.txt from CI_COMMIT_SHA; PHP HTML (already
no-store) links CSS/JS with ?v=<sha> so browsers fetch fresh assets without
users clearing cache.

timfa Tim Falken · pushed by timfa

Authored 2026-09-13 · 2 months ago

Hash
95b1d41d95f40fbda5e8088360e9ae20aff1e043
Parent
6451d436
8 files changed +88 −12
.gitignore +3 −0
@@ -10,3 +10,6 @@ __pycache__/
10 10 /.tablebase/
11 11
12 12 /web/lib/tablebase/
13
14 # Written at deploy time from CI_COMMIT_SHA for cache-busting.
15 /web/asset-version.txt
@@ -10,3 +10,6 @@ __pycache__/
10/.tablebase/
10/.tablebase/
11
11
12/web/lib/tablebase/
12/web/lib/tablebase/
13
14# Written at deploy time from CI_COMMIT_SHA for cache-busting.
15/web/asset-version.txt
ci/deploy.py +19 −1
@@ -49,9 +49,27 @@ def deployment_commands(environ, webroot):
49 49 ]
50 50 return '\n'.join(commands) + '\n'
51 51
52 def write_asset_version(webroot, environ=None):
53 """Stamp the deploy commit into web/asset-version.txt for cache-busting."""
54 environ = os.environ if environ is None else environ
55 sha = (environ.get('CI_COMMIT_SHA') or '').strip()
56 if not sha:
57 try:
58 sha = subprocess.check_output(
59 ['git', '-C', str(ROOT), 'rev-parse', 'HEAD'], text=True, stderr=subprocess.DEVNULL
60 ).strip()
61 except (subprocess.CalledProcessError, FileNotFoundError):
62 sha = ''
63 if not sha or len(sha) < 7:
64 raise ValueError('Unable to determine commit SHA for asset-version.txt (set CI_COMMIT_SHA).')
65 (webroot / 'asset-version.txt').write_text(sha + '\n', encoding='utf-8')
66 print(f'Wrote asset-version.txt = {sha}')
67
52 68 def main():
53 69 try:
54 commands = deployment_commands(os.environ, ROOT / 'web')
70 webroot = ROOT / 'web'
71 write_asset_version(webroot, os.environ)
72 commands = deployment_commands(os.environ, webroot)
55 73 subprocess.run(['lftp', '--norc'], input=commands, text=True,
56 74 env={**os.environ, 'LFTP_PASSWORD':os.environ['timftppassword']}, check=True)
57 75 except (ValueError, subprocess.CalledProcessError) as error:
@@ -49,9 +49,27 @@ def deployment_commands(environ, webroot):
49 ]
49 ]
50 return '\n'.join(commands) + '\n'
50 return '\n'.join(commands) + '\n'
51
51
52def write_asset_version(webroot, environ=None):
53 """Stamp the deploy commit into web/asset-version.txt for cache-busting."""
54 environ = os.environ if environ is None else environ
55 sha = (environ.get('CI_COMMIT_SHA') or '').strip()
56 if not sha:
57 try:
58 sha = subprocess.check_output(
59 ['git', '-C', str(ROOT), 'rev-parse', 'HEAD'], text=True, stderr=subprocess.DEVNULL
60 ).strip()
61 except (subprocess.CalledProcessError, FileNotFoundError):
62 sha = ''
63 if not sha or len(sha) < 7:
64 raise ValueError('Unable to determine commit SHA for asset-version.txt (set CI_COMMIT_SHA).')
65 (webroot / 'asset-version.txt').write_text(sha + '\n', encoding='utf-8')
66 print(f'Wrote asset-version.txt = {sha}')
67
52def main():
68def main():
53 try:
69 try:
54 commands = deployment_commands(os.environ, ROOT / 'web')
70 webroot = ROOT / 'web'
71 write_asset_version(webroot, os.environ)
72 commands = deployment_commands(os.environ, webroot)
55 subprocess.run(['lftp', '--norc'], input=commands, text=True,
73 subprocess.run(['lftp', '--norc'], input=commands, text=True,
56 env={**os.environ, 'LFTP_PASSWORD':os.environ['timftppassword']}, check=True)
74 env={**os.environ, 'LFTP_PASSWORD':os.environ['timftppassword']}, check=True)
57 except (ValueError, subprocess.CalledProcessError) as error:
75 except (ValueError, subprocess.CalledProcessError) as error:
ci/test_deploy.py +8 −1
@@ -14,7 +14,7 @@ config_logging(level=logging.ERROR)
14 14 from pyftpdlib.authorizers import DummyAuthorizer
15 15 from pyftpdlib.handlers import FTPHandler
16 16 from pyftpdlib.servers import FTPServer
17 from deploy import ROOT, deployment_commands
17 from deploy import ROOT, deployment_commands, write_asset_version
18 18
19 19 class DeployTests(unittest.TestCase):
20 20 def test_mirror_preserves_data(self):
@@ -64,6 +64,13 @@ class DeployTests(unittest.TestCase):
64 64 finally:
65 65 server.close_all();thread.join(timeout=2)
66 66
67
68 def test_write_asset_version_from_ci(self):
69 with tempfile.TemporaryDirectory() as directory:
70 webroot = Path(directory)
71 write_asset_version(webroot, {'CI_COMMIT_SHA': 'deadbeefcafebabe0123456789abcdef01234567'})
72 self.assertEqual((webroot/'asset-version.txt').read_text(), 'deadbeefcafebabe0123456789abcdef01234567\n')
73
67 74 def test_invalid_config_fails_before_connecting(self):
68 75 with self.assertRaises(ValueError):deployment_commands({},ROOT/'web')
69 76 env={'timftphost':'ftp://example.test','timftpuser':'user','timftppassword':'secret','projectftp':'x\nrm -r data'}
@@ -14,7 +14,7 @@ config_logging(level=logging.ERROR)
14from pyftpdlib.authorizers import DummyAuthorizer
14from pyftpdlib.authorizers import DummyAuthorizer
15from pyftpdlib.handlers import FTPHandler
15from pyftpdlib.handlers import FTPHandler
16from pyftpdlib.servers import FTPServer
16from pyftpdlib.servers import FTPServer
17from deploy import ROOT, deployment_commands
17from deploy import ROOT, deployment_commands, write_asset_version
18
18
19class DeployTests(unittest.TestCase):
19class DeployTests(unittest.TestCase):
20 def test_mirror_preserves_data(self):
20 def test_mirror_preserves_data(self):
@@ -64,6 +64,13 @@ class DeployTests(unittest.TestCase):
64 finally:
64 finally:
65 server.close_all();thread.join(timeout=2)
65 server.close_all();thread.join(timeout=2)
66
66
67
68 def test_write_asset_version_from_ci(self):
69 with tempfile.TemporaryDirectory() as directory:
70 webroot = Path(directory)
71 write_asset_version(webroot, {'CI_COMMIT_SHA': 'deadbeefcafebabe0123456789abcdef01234567'})
72 self.assertEqual((webroot/'asset-version.txt').read_text(), 'deadbeefcafebabe0123456789abcdef01234567\n')
73
67 def test_invalid_config_fails_before_connecting(self):
74 def test_invalid_config_fails_before_connecting(self):
68 with self.assertRaises(ValueError):deployment_commands({},ROOT/'web')
75 with self.assertRaises(ValueError):deployment_commands({},ROOT/'web')
69 env={'timftphost':'ftp://example.test','timftpuser':'user','timftppassword':'secret','projectftp':'x\nrm -r data'}
76 env={'timftphost':'ftp://example.test','timftpuser':'user','timftppassword':'secret','projectftp':'x\nrm -r data'}
web/.htaccess +7 −0
@@ -11,3 +11,10 @@ DirectoryIndex index.php
11 11 <IfModule mod_mime.c>
12 12 AddType application/manifest+json .webmanifest
13 13 </IfModule>
14
15 # Versioned asset URLs (?v=commit) may be cached for a long time.
16 <IfModule mod_headers.c>
17 <FilesMatch "\.(css|js|png|svg|webp|woff2?)$">
18 Header set Cache-Control "public, max-age=31536000, immutable"
19 </FilesMatch>
20 </IfModule>
@@ -11,3 +11,10 @@ DirectoryIndex index.php
11<IfModule mod_mime.c>
11<IfModule mod_mime.c>
12 AddType application/manifest+json .webmanifest
12 AddType application/manifest+json .webmanifest
13</IfModule>
13</IfModule>
14
15# Versioned asset URLs (?v=commit) may be cached for a long time.
16<IfModule mod_headers.c>
17 <FilesMatch "\.(css|js|png|svg|webp|woff2?)$">
18 Header set Cache-Control "public, max-age=31536000, immutable"
19 </FilesMatch>
20</IfModule>
web/assets/app.js +21 −6
@@ -1,6 +1,21 @@
1 1 'use strict';
2 2 const $ = (s, root = document) => root.querySelector(s);
3 3 const esc = s => String(s ?? '').replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
4 // Server embeds the deploy commit in <meta name="asset-version">; append to static URLs.
5 const assetVersion = document.querySelector('meta[name="asset-version"]')?.content || '';
6 const withAssetVersion = url => {
7 if (!assetVersion) return url;
8 return url + (url.includes('?') ? '&' : '?') + 'v=' + encodeURIComponent(assetVersion);
9 };
10 (() => {
11 // Backup only: HTML already no-stores and links use ?v=. Helps stuck PWA/shell tabs.
12 if (!assetVersion) return;
13 const key = 'microchess-asset-version';
14 const prev = localStorage.getItem(key);
15 if (prev === assetVersion) return;
16 localStorage.setItem(key, assetVersion);
17 if (prev) location.reload();
18 })();
4 19 const names = { p: 'Pawn', r: 'Rook', n: 'Knight', b: 'Bishop', q: 'Queen', k: 'King' };
5 20 const materialValues = { p: 1, n: 3, b: 3, r: 5, q: 9, k: 0 };
6 21 const PIECE_COLOR_ORDER = ['White', 'Black', 'Red', 'Blue', 'Green', 'Yellow'];
@@ -11,11 +26,11 @@ function customColoursDisabled ()
11 26 // Account preference (default off → custom colours visible).
12 27 return !!(state?.user?.disableCustomColours);
13 28 }
14 const classicPieceUrl = p => `assets/pieces/${p.toLowerCase()}${p === p.toUpperCase() ? 'l' : 'd'}t.svg`;
29 const classicPieceUrl = p => withAssetVersion(`assets/pieces/${p.toLowerCase()}${p === p.toUpperCase() ? 'l' : 'd'}t.svg`);
15 30 const pieceUrl = (p, skin) =>
16 31 {
17 32 if (!skin || customColoursDisabled() || !CUSTOM_PIECE_SKINS.has(skin)) return classicPieceUrl(p);
18 return `assets/avatars/${skin.toLowerCase()}-${pieceFileNames[p.toLowerCase()]}.png`;
33 return withAssetVersion(`assets/avatars/${skin.toLowerCase()}-${pieceFileNames[p.toLowerCase()]}.png`);
19 34 };
20 35 function skinForPiece (g, p)
21 36 {
@@ -41,7 +56,7 @@ function colorTagMarkup (g)
41 56 }
42 57 function kingAvatarUrl (color)
43 58 {
44 return `assets/avatars/${color.toLowerCase()}-king.png`;
59 return withAssetVersion(`assets/avatars/${color.toLowerCase()}-king.png`);
45 60 }
46 61 function nextColorSkipping (current, skip)
47 62 {
@@ -55,7 +70,7 @@ function nextColorSkipping (current, skip)
55 70 return current;
56 71 }
57 72 const initials = name => esc(name.slice(0, 2).toUpperCase());
58 const avatarUrl = id => `assets/avatars/${encodeURIComponent(id)}.png`;
73 const avatarUrl = id => withAssetVersion(`assets/avatars/${encodeURIComponent(id)}.png`);
59 74 function avatarMarkup (name, id, editable = false)
60 75 {
61 76 const content = id ? `<img src="${avatarUrl(id)}" alt="" draggable="false">` : initials(name);
@@ -69,10 +84,10 @@ async function chooseAvatar ()
69 84 modal.classList.add('avatar-picker');
70 85 try
71 86 {
72 if (!avatarOptions) { const response = await fetch('assets/avatars/catalog.json'); if (!response.ok) throw new Error('Unable to load avatars. Please try again.'); avatarOptions = await response.json(); }
87 if (!avatarOptions) { const response = await fetch(withAssetVersion('assets/avatars/catalog.json')); if (!response.ok) throw new Error('Unable to load avatars. Please try again.'); avatarOptions = await response.json(); }
73 88 if (!modal.open || !modal.classList.contains('avatar-picker')) return;
74 89 avatarGroup = 'all'; avatarColor = 'all';
75 $('#modal-content').innerHTML = `<span class="eyebrow">MAKE IT YOURS</span><h2 id="modal-title">Choose your avatar</h2><p>A little character for your next rivalry. Select a piece to save it.</p><div class="avatar-filters"><div class="avatar-tabs" aria-label="Piece family">${[['all', 'All pieces'], ['standard', 'Chess'], ['fairy', 'Fairy chess']].map(([id, label]) => `<button class="secondary" data-avatar-group="${id}" aria-pressed="${id === 'all'}">${label}</button>`).join('')}</div><select id="avatar-color" aria-label="Filter avatars by color"><option value="all">All colors</option>${[...new Set(avatarOptions.map(a => a.color))].sort().map(c => `<option value="${esc(c)}">${esc(c)}</option>`).join('')}</select></div><div id="avatar-choices" class="avatar-choices" aria-label="Available avatars"></div><div class="avatar-picker-footer"><button class="text-button" data-avatar-choice="">Choose randomly</button><span id="avatar-option-count" class="inline-note" role="status"></span></div><p class="avatar-credits">Pieces by Wikimedia Commons contributors. <a href="assets/avatars/CREDITS.md" target="_blank" rel="noopener">Sources &amp; licenses ↗</a></p>`;
90 $('#modal-content').innerHTML = `<span class="eyebrow">MAKE IT YOURS</span><h2 id="modal-title">Choose your avatar</h2><p>A little character for your next rivalry. Select a piece to save it.</p><div class="avatar-filters"><div class="avatar-tabs" aria-label="Piece family">${[['all', 'All pieces'], ['standard', 'Chess'], ['fairy', 'Fairy chess']].map(([id, label]) => `<button class="secondary" data-avatar-group="${id}" aria-pressed="${id === 'all'}">${label}</button>`).join('')}</div><select id="avatar-color" aria-label="Filter avatars by color"><option value="all">All colors</option>${[...new Set(avatarOptions.map(a => a.color))].sort().map(c => `<option value="${esc(c)}">${esc(c)}</option>`).join('')}</select></div><div id="avatar-choices" class="avatar-choices" aria-label="Available avatars"></div><div class="avatar-picker-footer"><button class="text-button" data-avatar-choice="">Choose randomly</button><span id="avatar-option-count" class="inline-note" role="status"></span></div><p class="avatar-credits">Pieces by Wikimedia Commons contributors. <a href="${withAssetVersion('assets/avatars/CREDITS.md')}" target="_blank" rel="noopener">Sources &amp; licenses ↗</a></p>`;
76 91 renderAvatarChoices();
77 92 } catch (e) { toast(e.message); if (modal.classList.contains('avatar-picker')) closeModal(); }
78 93 }
@@ -1,6 +1,21 @@
1'use strict';
1'use strict';
2const $ = (s, root = document) => root.querySelector(s);
2const $ = (s, root = document) => root.querySelector(s);
3const esc = s => String(s ?? '').replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
3const esc = s => String(s ?? '').replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
4// Server embeds the deploy commit in <meta name="asset-version">; append to static URLs.
5const assetVersion = document.querySelector('meta[name="asset-version"]')?.content || '';
6const withAssetVersion = url => {
7 if (!assetVersion) return url;
8 return url + (url.includes('?') ? '&' : '?') + 'v=' + encodeURIComponent(assetVersion);
9};
10(() => {
11 // Backup only: HTML already no-stores and links use ?v=. Helps stuck PWA/shell tabs.
12 if (!assetVersion) return;
13 const key = 'microchess-asset-version';
14 const prev = localStorage.getItem(key);
15 if (prev === assetVersion) return;
16 localStorage.setItem(key, assetVersion);
17 if (prev) location.reload();
18})();
4const names = { p: 'Pawn', r: 'Rook', n: 'Knight', b: 'Bishop', q: 'Queen', k: 'King' };
19const names = { p: 'Pawn', r: 'Rook', n: 'Knight', b: 'Bishop', q: 'Queen', k: 'King' };
5const materialValues = { p: 1, n: 3, b: 3, r: 5, q: 9, k: 0 };
20const materialValues = { p: 1, n: 3, b: 3, r: 5, q: 9, k: 0 };
6const PIECE_COLOR_ORDER = ['White', 'Black', 'Red', 'Blue', 'Green', 'Yellow'];
21const PIECE_COLOR_ORDER = ['White', 'Black', 'Red', 'Blue', 'Green', 'Yellow'];
@@ -11,11 +26,11 @@ function customColoursDisabled ()
11 // Account preference (default off → custom colours visible).
26 // Account preference (default off → custom colours visible).
12 return !!(state?.user?.disableCustomColours);
27 return !!(state?.user?.disableCustomColours);
13}
28}
14const classicPieceUrl = p => `assets/pieces/${p.toLowerCase()}${p === p.toUpperCase() ? 'l' : 'd'}t.svg`;
29const classicPieceUrl = p => withAssetVersion(`assets/pieces/${p.toLowerCase()}${p === p.toUpperCase() ? 'l' : 'd'}t.svg`);
15const pieceUrl = (p, skin) =>
30const pieceUrl = (p, skin) =>
16{
31{
17 if (!skin || customColoursDisabled() || !CUSTOM_PIECE_SKINS.has(skin)) return classicPieceUrl(p);
32 if (!skin || customColoursDisabled() || !CUSTOM_PIECE_SKINS.has(skin)) return classicPieceUrl(p);
18 return `assets/avatars/${skin.toLowerCase()}-${pieceFileNames[p.toLowerCase()]}.png`;
33 return withAssetVersion(`assets/avatars/${skin.toLowerCase()}-${pieceFileNames[p.toLowerCase()]}.png`);
19};
34};
20function skinForPiece (g, p)
35function skinForPiece (g, p)
21{
36{
@@ -41,7 +56,7 @@ function colorTagMarkup (g)
41}
56}
42function kingAvatarUrl (color)
57function kingAvatarUrl (color)
43{
58{
44 return `assets/avatars/${color.toLowerCase()}-king.png`;
59 return withAssetVersion(`assets/avatars/${color.toLowerCase()}-king.png`);
45}
60}
46function nextColorSkipping (current, skip)
61function nextColorSkipping (current, skip)
47{
62{
@@ -55,7 +70,7 @@ function nextColorSkipping (current, skip)
55 return current;
70 return current;
56}
71}
57const initials = name => esc(name.slice(0, 2).toUpperCase());
72const initials = name => esc(name.slice(0, 2).toUpperCase());
58const avatarUrl = id => `assets/avatars/${encodeURIComponent(id)}.png`;
73const avatarUrl = id => withAssetVersion(`assets/avatars/${encodeURIComponent(id)}.png`);
59function avatarMarkup (name, id, editable = false)
74function avatarMarkup (name, id, editable = false)
60{
75{
61 const content = id ? `<img src="${avatarUrl(id)}" alt="" draggable="false">` : initials(name);
76 const content = id ? `<img src="${avatarUrl(id)}" alt="" draggable="false">` : initials(name);
@@ -69,10 +84,10 @@ async function chooseAvatar ()
69 modal.classList.add('avatar-picker');
84 modal.classList.add('avatar-picker');
70 try
85 try
71 {
86 {
72 if (!avatarOptions) { const response = await fetch('assets/avatars/catalog.json'); if (!response.ok) throw new Error('Unable to load avatars. Please try again.'); avatarOptions = await response.json(); }
87 if (!avatarOptions) { const response = await fetch(withAssetVersion('assets/avatars/catalog.json')); if (!response.ok) throw new Error('Unable to load avatars. Please try again.'); avatarOptions = await response.json(); }
73 if (!modal.open || !modal.classList.contains('avatar-picker')) return;
88 if (!modal.open || !modal.classList.contains('avatar-picker')) return;
74 avatarGroup = 'all'; avatarColor = 'all';
89 avatarGroup = 'all'; avatarColor = 'all';
75 $('#modal-content').innerHTML = `<span class="eyebrow">MAKE IT YOURS</span><h2 id="modal-title">Choose your avatar</h2><p>A little character for your next rivalry. Select a piece to save it.</p><div class="avatar-filters"><div class="avatar-tabs" aria-label="Piece family">${[['all', 'All pieces'], ['standard', 'Chess'], ['fairy', 'Fairy chess']].map(([id, label]) => `<button class="secondary" data-avatar-group="${id}" aria-pressed="${id === 'all'}">${label}</button>`).join('')}</div><select id="avatar-color" aria-label="Filter avatars by color"><option value="all">All colors</option>${[...new Set(avatarOptions.map(a => a.color))].sort().map(c => `<option value="${esc(c)}">${esc(c)}</option>`).join('')}</select></div><div id="avatar-choices" class="avatar-choices" aria-label="Available avatars"></div><div class="avatar-picker-footer"><button class="text-button" data-avatar-choice="">Choose randomly</button><span id="avatar-option-count" class="inline-note" role="status"></span></div><p class="avatar-credits">Pieces by Wikimedia Commons contributors. <a href="assets/avatars/CREDITS.md" target="_blank" rel="noopener">Sources &amp; licenses ↗</a></p>`;
90 $('#modal-content').innerHTML = `<span class="eyebrow">MAKE IT YOURS</span><h2 id="modal-title">Choose your avatar</h2><p>A little character for your next rivalry. Select a piece to save it.</p><div class="avatar-filters"><div class="avatar-tabs" aria-label="Piece family">${[['all', 'All pieces'], ['standard', 'Chess'], ['fairy', 'Fairy chess']].map(([id, label]) => `<button class="secondary" data-avatar-group="${id}" aria-pressed="${id === 'all'}">${label}</button>`).join('')}</div><select id="avatar-color" aria-label="Filter avatars by color"><option value="all">All colors</option>${[...new Set(avatarOptions.map(a => a.color))].sort().map(c => `<option value="${esc(c)}">${esc(c)}</option>`).join('')}</select></div><div id="avatar-choices" class="avatar-choices" aria-label="Available avatars"></div><div class="avatar-picker-footer"><button class="text-button" data-avatar-choice="">Choose randomly</button><span id="avatar-option-count" class="inline-note" role="status"></span></div><p class="avatar-credits">Pieces by Wikimedia Commons contributors. <a href="${withAssetVersion('assets/avatars/CREDITS.md')}" target="_blank" rel="noopener">Sources &amp; licenses ↗</a></p>`;
76 renderAvatarChoices();
91 renderAvatarChoices();
77 } catch (e) { toast(e.message); if (modal.classList.contains('avatar-picker')) closeModal(); }
92 } catch (e) { toast(e.message); if (modal.classList.contains('avatar-picker')) closeModal(); }
78}
93}
web/assets/pwa.js +3 −1
@@ -9,7 +9,9 @@
9 9 const notice = document.querySelector('#notification-dialog');
10 10 let target = new URLSearchParams(location.search).get('game'), highlightUntil = 0;
11 11 if (!/^[1-9][0-9]{0,14}$/.test(target || '')) target = null;
12 const registration = 'serviceWorker' in navigator ? navigator.serviceWorker.register('sw.js').catch(() => null) : Promise.resolve(null);
12 const assetVersion = document.querySelector('meta[name="asset-version"]')?.content || '';
13 const swUrl = assetVersion ? `sw.js?v=${encodeURIComponent(assetVersion)}` : 'sw.js';
14 const registration = 'serviceWorker' in navigator ? navigator.serviceWorker.register(swUrl).catch(() => null) : Promise.resolve(null);
13 15 async function subscription () { const reg = await registration; return reg?.pushManager ? reg.pushManager.getSubscription() : null; }
14 16 async function endpoint () { try { return (await subscription())?.endpoint || ''; } catch (_) { return ''; } }
15 17 async function sync ()
@@ -9,7 +9,9 @@
9 const notice = document.querySelector('#notification-dialog');
9 const notice = document.querySelector('#notification-dialog');
10 let target = new URLSearchParams(location.search).get('game'), highlightUntil = 0;
10 let target = new URLSearchParams(location.search).get('game'), highlightUntil = 0;
11 if (!/^[1-9][0-9]{0,14}$/.test(target || '')) target = null;
11 if (!/^[1-9][0-9]{0,14}$/.test(target || '')) target = null;
12 const registration = 'serviceWorker' in navigator ? navigator.serviceWorker.register('sw.js').catch(() => null) : Promise.resolve(null);
12 const assetVersion = document.querySelector('meta[name="asset-version"]')?.content || '';
13 const swUrl = assetVersion ? `sw.js?v=${encodeURIComponent(assetVersion)}` : 'sw.js';
14 const registration = 'serviceWorker' in navigator ? navigator.serviceWorker.register(swUrl).catch(() => null) : Promise.resolve(null);
13 async function subscription () { const reg = await registration; return reg?.pushManager ? reg.pushManager.getSubscription() : null; }
15 async function subscription () { const reg = await registration; return reg?.pushManager ? reg.pushManager.getSubscription() : null; }
14 async function endpoint () { try { return (await subscription())?.endpoint || ''; } catch (_) { return ''; } }
16 async function endpoint () { try { return (await subscription())?.endpoint || ''; } catch (_) { return ''; } }
15 async function sync ()
17 async function sync ()
web/index.php +4 −3
@@ -11,11 +11,12 @@ $loginQuery=http_build_query(array_filter(['invite'=>$invite,'game'=>$game]));
11 11 <head>
12 12 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
13 13 <meta name="theme-color" content="#f5f3ed"><title>Microchess — Small board. Big game.</title>
14 <link rel="icon" href="assets/pieces/nlt.svg" type="image/svg+xml">
14 <link rel="icon" href="<?= htmlspecialchars(assetUrl('assets/pieces/nlt.svg')) ?>" type="image/svg+xml">
15 15 <link rel="manifest" href="manifest.webmanifest">
16 <link rel="apple-touch-icon" href="assets/app-icon-180.png">
16 <link rel="apple-touch-icon" href="<?= htmlspecialchars(assetUrl('assets/app-icon-180.png')) ?>">
17 17 <meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
18 <link rel="stylesheet" href="assets/app.css"><script src="assets/app.js" defer></script><script src="assets/pwa.js" defer></script>
18 <meta name="asset-version" content="<?= htmlspecialchars(assetVersion()) ?>">
19 <link rel="stylesheet" href="<?= htmlspecialchars(assetUrl('assets/app.css')) ?>"><script src="<?= htmlspecialchars(assetUrl('assets/app.js')) ?>" defer></script><script src="<?= htmlspecialchars(assetUrl('assets/pwa.js')) ?>" defer></script>
19 20 </head>
20 21 <body<?= $sharedReplay?' class="replay-page"':'' ?>>
21 22 <?php if (!$sharedReplay): ?>
@@ -11,11 +11,12 @@ $loginQuery=http_build_query(array_filter(['invite'=>$invite,'game'=>$game]));
11<head>
11<head>
12<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
12<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
13<meta name="theme-color" content="#f5f3ed"><title>Microchess — Small board. Big game.</title>
13<meta name="theme-color" content="#f5f3ed"><title>Microchess — Small board. Big game.</title>
14<link rel="icon" href="assets/pieces/nlt.svg" type="image/svg+xml">
14<link rel="icon" href="<?= htmlspecialchars(assetUrl('assets/pieces/nlt.svg')) ?>" type="image/svg+xml">
15<link rel="manifest" href="manifest.webmanifest">
15<link rel="manifest" href="manifest.webmanifest">
16<link rel="apple-touch-icon" href="assets/app-icon-180.png">
16<link rel="apple-touch-icon" href="<?= htmlspecialchars(assetUrl('assets/app-icon-180.png')) ?>">
17<meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
17<meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="Microchess">
18<link rel="stylesheet" href="assets/app.css"><script src="assets/app.js" defer></script><script src="assets/pwa.js" defer></script>
18<meta name="asset-version" content="<?= htmlspecialchars(assetVersion()) ?>">
19<link rel="stylesheet" href="<?= htmlspecialchars(assetUrl('assets/app.css')) ?>"><script src="<?= htmlspecialchars(assetUrl('assets/app.js')) ?>" defer></script><script src="<?= htmlspecialchars(assetUrl('assets/pwa.js')) ?>" defer></script>
19</head>
20</head>
20<body<?= $sharedReplay?' class="replay-page"':'' ?>>
21<body<?= $sharedReplay?' class="replay-page"':'' ?>>
21<?php if (!$sharedReplay): ?>
22<?php if (!$sharedReplay): ?>
web/lib/bootstrap.php +23 −0
@@ -181,6 +181,29 @@ function baseUrl(): string {
181 181 if (!str_starts_with($base,'https://')) throw new RuntimeException("Set 'base_url' in data/config.php to this application's production HTTPS URL, or set MICROCHESS_BASE_URL. The data directory is excluded from deployment; update this file on the production server separately.");
182 182 return $base;
183 183 }
184 function assetVersion(): string {
185 static $v;
186 if ($v !== null) return $v;
187 $file=dirname(__DIR__).'/asset-version.txt';
188 if (is_readable($file)) {
189 $hash=trim((string)file_get_contents($file));
190 if ($hash!=='' && preg_match('/^[0-9a-f]{7,64}$/i',$hash)) return $v=$hash;
191 }
192 $env=getenv('CI_COMMIT_SHA')?:getenv('MICROCHESS_ASSET_VERSION')?:'';
193 if (is_string($env) && preg_match('/^[0-9a-f]{7,64}$/i',trim($env))) return $v=trim($env);
194 $git=dirname(__DIR__,2).'/.git';
195 if (is_dir($git)) {
196 $out=@shell_exec('git -C '.escapeshellarg(dirname($git)).' rev-parse HEAD 2>/dev/null');
197 if (is_string($out) && preg_match('/^[0-9a-f]{7,64}$/i',trim($out))) return $v=trim($out);
198 }
199 $js=dirname(__DIR__).'/assets/app.js';
200 return $v=is_file($js)?(string)filemtime($js):'0';
201 }
202 function assetUrl(string $path): string {
203 $path=ltrim($path,'/');
204 $v=rawurlencode(assetVersion());
205 return str_contains($path,'?')?$path.'&v='.$v:$path.'?v='.$v;
206 }
184 207 function authRequest(string $path,?array $form=null,?string $token=null): array {
185 208 $ch=curl_init('https://auth.timfalken.com'.$path);
186 209 $headers=['Accept: application/json','User-Agent: Microchess/1.0'];
@@ -181,6 +181,29 @@ function baseUrl(): string {
181 if (!str_starts_with($base,'https://')) throw new RuntimeException("Set 'base_url' in data/config.php to this application's production HTTPS URL, or set MICROCHESS_BASE_URL. The data directory is excluded from deployment; update this file on the production server separately.");
181 if (!str_starts_with($base,'https://')) throw new RuntimeException("Set 'base_url' in data/config.php to this application's production HTTPS URL, or set MICROCHESS_BASE_URL. The data directory is excluded from deployment; update this file on the production server separately.");
182 return $base;
182 return $base;
183}
183}
184function assetVersion(): string {
185 static $v;
186 if ($v !== null) return $v;
187 $file=dirname(__DIR__).'/asset-version.txt';
188 if (is_readable($file)) {
189 $hash=trim((string)file_get_contents($file));
190 if ($hash!=='' && preg_match('/^[0-9a-f]{7,64}$/i',$hash)) return $v=$hash;
191 }
192 $env=getenv('CI_COMMIT_SHA')?:getenv('MICROCHESS_ASSET_VERSION')?:'';
193 if (is_string($env) && preg_match('/^[0-9a-f]{7,64}$/i',trim($env))) return $v=trim($env);
194 $git=dirname(__DIR__,2).'/.git';
195 if (is_dir($git)) {
196 $out=@shell_exec('git -C '.escapeshellarg(dirname($git)).' rev-parse HEAD 2>/dev/null');
197 if (is_string($out) && preg_match('/^[0-9a-f]{7,64}$/i',trim($out))) return $v=trim($out);
198 }
199 $js=dirname(__DIR__).'/assets/app.js';
200 return $v=is_file($js)?(string)filemtime($js):'0';
201}
202function assetUrl(string $path): string {
203 $path=ltrim($path,'/');
204 $v=rawurlencode(assetVersion());
205 return str_contains($path,'?')?$path.'&v='.$v:$path.'?v='.$v;
206}
184function authRequest(string $path,?array $form=null,?string $token=null): array {
207function authRequest(string $path,?array $form=null,?string $token=null): array {
185 $ch=curl_init('https://auth.timfalken.com'.$path);
208 $ch=curl_init('https://auth.timfalken.com'.$path);
186 $headers=['Accept: application/json','User-Agent: Microchess/1.0'];
209 $headers=['Accept: application/json','User-Agent: Microchess/1.0'];