diff --git a/sidecar/rewrite.test.ts b/sidecar/rewrite.test.ts index 7119c6b..79894e2 100644 --- a/sidecar/rewrite.test.ts +++ b/sidecar/rewrite.test.ts @@ -40,6 +40,17 @@ describe('appSubUrl — the line that makes Gitea correct itself', () => { test('an existing subpath is replaced, not appended to', () => { expect(rewriteAppSubUrl('{"appSubUrl":"/git"}', BASE)).toBe(`{"appSubUrl":"${BASE}"}`); }); + + // The shape Gitea ACTUALLY emits — a JavaScript object literal, unquoted key, single quotes. The first + // version of this only matched the JSON form, so it silently did nothing on every real page while the + // attributes around it rewrote perfectly. Taken verbatim from a live response. + test('the JS object-literal form Gitea really emits', () => { + const real = "window.config = {\n appUrl: 'https://gitea.officer.dev/',\n appSubUrl: '',\n};"; + const out = rewriteAppSubUrl(real, BASE); + expect(out).toContain(`appSubUrl: '${BASE}'`); + // The quote style is preserved, or the literal stops parsing. + expect(out).not.toContain(`appSubUrl: "${BASE}"`); + }); }); describe('absolute URLs built from ROOT_URL', () => { diff --git a/sidecar/rewrite.ts b/sidecar/rewrite.ts index d14faf7..ea6ec8b 100644 --- a/sidecar/rewrite.ts +++ b/sidecar/rewrite.ts @@ -74,7 +74,14 @@ export function rewriteAttributes(html: string, base: string): string { * Matched narrowly on the key so a repository whose CONTENT contains the string is untouched. */ export function rewriteAppSubUrl(html: string, base: string): string { - return html.replace(/"appSubUrl"\s*:\s*"[^"]*"/g, `"appSubUrl":"${base}"`); + // Both shapes, because Gitea emits the SECOND one and this originally only matched the first: + // "appSubUrl":"…" JSON, which is what an API response looks like + // appSubUrl: '…' a JavaScript object literal, unquoted key and single quotes — the real page + // Guessing the shape is why this silently did nothing while every attribute around it was rewritten + // correctly. The quote style is captured and reused so the emitted literal stays valid either way. + return html.replace(/(["']?appSubUrl["']?\s*:\s*)(["'])[^"']*\2/g, (_m, head: string, quote: string) => + `${head}${quote}${base}${quote}`, + ); } /**