fix: use array buffers to avoid coercing to text

nitrojs · Jun 29, 2022 · d2f7166 · d2f7166
1 parent 8f40676
commit d2f7166
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/prerender.ts b/src/prerender.ts
@@ -53,7 +53,7 @@ export async function prerender (nitro: Nitro) {
 
     // Fetch the route
     const res = await (localFetch(withBase(route, nitro.options.baseURL), { headers: { 'X-Nitro-Prerender': route } }) as ReturnType<typeof fetch>)
-    _route.contents = await res.text()
+    _route.data = await res.arrayBuffer()
     if (res.status !== 200) {
       _route.error = new Error(`[${res.status}] ${res.statusText}`) as any
       _route.error.statusCode = res.status
@@ -65,15 +65,15 @@ export async function prerender (nitro: Nitro) {
     const routeWithIndex = route.endsWith('/') ? route + 'index' : route
     _route.fileName = isImplicitHTML ? route + '/index.html' : routeWithIndex
     const filePath = join(nitro.options.output.publicDir, _route.fileName)
-    const isBinary = isBinaryContentType(res.headers.get('content-type'))
-    await writeFile(filePath, _route.contents, false, isBinary ? 'binary' : 'utf-8')
+    await writeFile(filePath, Buffer.from(_route.data))
 
     // Crawl route links
     if (
       !_route.error &&
       nitro.options.prerender.crawlLinks &&
       isImplicitHTML
     ) {
+      _route.contents = new TextDecoder('utf-8').decode(new Uint8Array(_route.data))
       const crawledRoutes = extractLinks(_route.contents, route, res)
       for (const crawledRoute of crawledRoutes) {
         if (canPrerender(crawledRoute)) {

diff --git a/src/types/nitro.ts b/src/types/nitro.ts
@@ -27,6 +27,7 @@ export interface Nitro {
 export interface PrerenderRoute {
   route: string
   contents?: string
+  data?: ArrayBuffer
   fileName?: string
   error?: Error & { statusCode: number, statusMessage: string }
   generateTimeMS?: number

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -37,9 +37,9 @@ export function tryImport (dir: string, path: string) {
   } catch (_err) { }
 }
 
-export async function writeFile (file: string, contents: string, log = false, format = 'utf-8') {
+export async function writeFile (file: string, contents: Buffer | string, log = false) {
   await fse.mkdirp(dirname(file))
-  await fse.writeFile(file, contents, format)
+  await fse.writeFile(file, contents, typeof contents === 'string' ? 'utf-8' : undefined)
   if (log) {
     consola.info('Generated', prettyPath(file))
   }
@@ -145,7 +145,3 @@ export function resolveAliases (aliases: Record<string, string>) {
   }
   return aliases
 }
-
-const BINARY_CONTENT_TYPE_RE = /^(audio|font|video|image\/(?!svg)|application\/(?!json))/
-export const isBinaryContentType = (contentType = '') =>
-  BINARY_CONTENT_TYPE_RE.test(contentType)