Skip to content

Fix translation worker HTML parsing and HEAD cache refresh #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riderx merged 1 commit into from
May 1, 2026
Merged

Fix translation worker HTML parsing and HEAD cache refresh #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions apps/translation-worker/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,28 @@ function appendTag(parts: HtmlPart[], segments: Segment[], tag: string, skipText
parts.push(tag.slice(lastIndex))
}

function findTagEnd(html: string, tagStartIndex: number): number | null {
let quote: '"' | "'" | null = null

for (let index = tagStartIndex + 1; index < html.length; index += 1) {
const char = html[index]

if (quote) {
if (char === quote) quote = null
continue
}

if (char === '"' || char === "'") {
quote = char
continue
}

if (char === '>') return index
}

return null
}

function findNextHtmlTag(html: string, startIndex: number): { index: number; end: number; tag: string } | null {
const index = html.indexOf('<', startIndex)
if (index === -1) return null
Expand All @@ -419,8 +441,8 @@ function findNextHtmlTag(html: string, startIndex: number): { index: number; end
return { index, end, tag: html.slice(index, end) }
}

const tagEnd = html.indexOf('>', index + 1)
if (tagEnd === -1) return null
const tagEnd = findTagEnd(html, index)
if (tagEnd === null) return null
const end = tagEnd + 1
return { index, end, tag: html.slice(index, end) }
}
Expand Down Expand Up @@ -660,8 +682,8 @@ function findOpeningTag(html: string, tagName: string): { index: number; end: nu
continue
}

const tagEnd = html.indexOf('>', index + needle.length)
if (tagEnd === -1) return null
const tagEnd = findTagEnd(html, index)
if (tagEnd === null) return null
const end = tagEnd + 1
return { index, end, tag: html.slice(index, end) }
}
Expand Down Expand Up @@ -872,7 +894,8 @@ async function buildTranslatedResponse(request: Request, env: Env, requestUrl: U
}

async function refreshCache(request: Request, env: Env, requestUrl: URL, locale: Locale, cacheKey: Request): Promise<Response> {
const response = await buildTranslatedResponse(request, env, requestUrl, locale)
const renderRequest = request.method === 'GET' ? request : new Request(request, { method: 'GET' })
const response = await buildTranslatedResponse(renderRequest, env, requestUrl, locale)
if (response.ok && isHtmlResponse(response)) {
const cachedResponse = toCachedResponse(response.clone())
await caches.default.put(cacheKey, cachedResponse)
Expand Down
Loading