Skip to content

Commit

Permalink
feat: gzip html reporter's metadata (#3113)
Browse files Browse the repository at this point in the history
  • Loading branch information
7rulnik authored Apr 5, 2023
1 parent 7347179 commit 7856ec1
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 8 deletions.
11 changes: 10 additions & 1 deletion packages/ui/client/composables/client/static.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { BirpcReturn } from 'birpc'
import type { VitestClient } from '@vitest/ws-client'
import type { WebSocketHandlers } from 'vitest/src/api/types'
import { parse } from 'flatted'
import { decompressSync, strFromU8 } from 'fflate'
import type { File, ModuleGraphData, ResolvedConfig } from 'vitest/src/types'
import { StateManager } from '../../../../vitest/src/node/state'

Expand Down Expand Up @@ -72,7 +73,15 @@ export function createStaticClient(): VitestClient {

async function registerMetadata() {
const res = await fetch(window.METADATA_PATH!)
metadata = parse(await res.text()) as HTMLReportMetadata
const contentType = res.headers.get('content-type')?.toLowerCase() || ''
if (contentType.includes('application/gzip')) {
const compressed = new Uint8Array(await res.arrayBuffer())
const decompressed = strFromU8(decompressSync(compressed))
metadata = parse(decompressed) as HTMLReportMetadata
}
else {
metadata = parse(await res.text()) as HTMLReportMetadata
}
const event = new Event('open')
ctx.ws.dispatchEvent(event)
}
Expand Down
10 changes: 8 additions & 2 deletions packages/ui/node/reporter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { promises as fs } from 'node:fs'
import { fileURLToPath } from 'node:url'
import { promisify } from 'node:util'
import { gzip, constants as zlibConstants } from 'node:zlib'
import { basename, dirname, relative, resolve } from 'pathe'
import c from 'picocolors'
import fg from 'fast-glob'
Expand Down Expand Up @@ -48,11 +50,15 @@ export default class HTMLReporter implements Reporter {
const htmlFileName = basename(htmlFile)
const htmlDir = resolve(this.ctx.config.root, dirname(htmlFile))

const metaFile = resolve(htmlDir, 'html.meta.json')
const metaFile = resolve(htmlDir, 'html.meta.json.gz')

await fs.mkdir(resolve(htmlDir, 'assets'), { recursive: true })

await fs.writeFile(metaFile, report, 'utf-8')
const promiseGzip = promisify(gzip)
const data = await promiseGzip(report, {
level: zlibConstants.Z_BEST_COMPRESSION,
})
await fs.writeFile(metaFile, data, 'base64')
const ui = resolve(distDir, 'client')
// copy ui
const files = fg.sync('**/*', { cwd: ui })
Expand Down
1 change: 1 addition & 0 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"dependencies": {
"@vitest/utils": "workspace:*",
"fast-glob": "^3.2.12",
"fflate": "^0.7.4",
"flatted": "^3.2.7",
"pathe": "^1.1.0",
"picocolors": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const config: UserConfig = {
name: 'debug-html-report',
apply: 'serve',
transformIndexHtml(html) {
return html.replace('<!-- !LOAD_METADATA! -->', `<script>window.METADATA_PATH="${debugLink}/html.meta.json"</script>`)
return html.replace('<!-- !LOAD_METADATA! -->', `<script>window.METADATA_PATH="${debugLink}/html.meta.json.gz"</script>`)
},
},
],
Expand Down
6 changes: 6 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions test/reporters/tests/html.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import fs from 'fs'
import zlib from 'zlib'
import { resolve } from 'pathe'
import { execa } from 'execa'
import { describe, expect, it } from 'vitest'
Expand All @@ -21,7 +22,8 @@ describe.skipIf(skip)('html reporter', async () => {
},
stdio: 'inherit',
}).catch(e => e)
const metaJson = fs.readFileSync(resolve(root, `${basePath}/html.meta.json`), { encoding: 'utf-8' })
const metaJsonGzipeed = fs.readFileSync(resolve(root, `${basePath}/html.meta.json.gz`))
const metaJson = zlib.gunzipSync(metaJsonGzipeed).toString('utf-8')
const indexHtml = fs.readFileSync(resolve(root, `${basePath}/index.html`), { encoding: 'utf-8' })
const resultJson = parse(metaJson.replace(new RegExp(vitestRoot, 'g'), '<rootDir>'))
resultJson.config = {} // doesn't matter for a test
Expand All @@ -38,7 +40,7 @@ describe.skipIf(skip)('html reporter', async () => {
expect(task.result.error).not.toBeDefined()
expect(task.result.logs).not.toBeDefined()
expect(resultJson).toMatchSnapshot(`tests are ${expected}`)
expect(indexHtml).toMatch('window.METADATA_PATH="html.meta.json"')
expect(indexHtml).toMatch('window.METADATA_PATH="html.meta.json.gz"')
}, 120000)

it('resolves to "failing" status for test file "json-fail"', async () => {
Expand All @@ -52,7 +54,8 @@ describe.skipIf(skip)('html reporter', async () => {
},
stdio: 'inherit',
}).catch(e => e)
const metaJson = fs.readFileSync(resolve(root, `${basePath}/html.meta.json`), { encoding: 'utf-8' })
const metaJsonGzipped = fs.readFileSync(resolve(root, `${basePath}/html.meta.json.gz`))
const metaJson = zlib.gunzipSync(metaJsonGzipped).toString('utf-8')
const indexHtml = fs.readFileSync(resolve(root, `${basePath}/index.html`), { encoding: 'utf-8' })
const resultJson = parse(metaJson.replace(new RegExp(vitestRoot, 'g'), '<rootDir>'))
resultJson.config = {} // doesn't matter for a test
Expand All @@ -77,6 +80,6 @@ describe.skipIf(skip)('html reporter', async () => {
task.logs[0].taskId = 0
task.logs[0].time = 0
expect(resultJson).toMatchSnapshot(`tests are ${expected}`)
expect(indexHtml).toMatch('window.METADATA_PATH="html.meta.json"')
expect(indexHtml).toMatch('window.METADATA_PATH="html.meta.json.gz"')
}, 120000)
})

0 comments on commit 7856ec1

Please sign in to comment.