Skip to content

Commit 4e96186

Browse files
Clean up server side rendered (#878)
* Cleaned Up Client Side Benchmark * Clean Up Server Side Rendered Benchmark * Fixed Config
1 parent 2336528 commit 4e96186

3 files changed

Lines changed: 33 additions & 18 deletions

File tree

‎packages/results/src/measurements-config.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ export const measurementsConfig = {
3333
scenario: interactionScenarioLabel,
3434
path: '/client-side-rendered',
3535
},
36-
serverSideRendered: { runs: 5, scenario: interactionScenarioLabel },
36+
serverSideRendered: {
37+
runs: 5,
38+
scenario: interactionScenarioLabel,
39+
path: '/server-side-rendered',
40+
},
3741
initialLoad: {
3842
path: '/initial-load',
3943
},

‎packages/stats-generator/src/serverSideRendered/index.ts‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { measurementsConfig } from '../measurements.ts'
2-
import { servingFrameworks } from '../serving-frameworks.ts'
2+
import { getFrameworks } from '../get-frameworks.ts'
33
import { startBenchmarkServer } from '../benchmark-server.ts'
44
import { getHost } from '../serve/common.ts'
55
import { runBenchmark } from './run-benchmark.ts'
@@ -12,31 +12,41 @@ export async function runServerSideRenderedBenchmark(
1212
packageName: string,
1313
runs: number = measurementsConfig.serverSideRendered.runs,
1414
): Promise<ServerSideRenderedBenchmarkResult> {
15-
const config = servingFrameworks.find((f) => f.package === packageName)
15+
const frameworks = (await getFrameworks()).filter(({ app }) =>
16+
app?.measurements.includes('serverSideRendered'),
17+
)
18+
const framework = frameworks.find(({ app }) => app?.package === packageName)
19+
const app = framework?.app
1620

17-
if (!config) {
21+
if (!framework || !app) {
1822
throw new Error(
19-
`Unknown server side rendered package: ${packageName}. Available: ${servingFrameworks.map((f) => f.package).join(', ')}`,
23+
`Unknown server side rendered package: ${packageName}. Available: ${frameworks.map(({ app }) => app?.package).join(', ')}`,
2024
)
2125
}
26+
if (!app.serveScript) {
27+
throw new Error(`Serve script is not configured for ${packageName}`)
28+
}
2229

23-
console.info(`Starting server for ${config.displayName}...`)
24-
const killServer = await startBenchmarkServer(config, {
25-
host: SERVER_SIDE_RENDERED_HOST,
26-
port: SERVER_SIDE_RENDERED_PORT,
27-
readinessPath: '/server-side-rendered',
28-
})
30+
const name = `${app.benchmarkName ?? framework.name}-server-side-rendered`
31+
const displayName = `${framework.displayName} Server Side Rendered`
32+
console.info(`Starting server for ${displayName}...`)
33+
const killServer = await startBenchmarkServer(
34+
{ package: packageName, serveScript: app.serveScript },
35+
{
36+
host: SERVER_SIDE_RENDERED_HOST,
37+
port: SERVER_SIDE_RENDERED_PORT,
38+
readinessPath: measurementsConfig.serverSideRendered.path,
39+
},
40+
)
2941

3042
try {
31-
console.info(
32-
`Running server side rendered benchmark for ${config.displayName}...`,
33-
)
43+
console.info(`Running server side rendered benchmark for ${displayName}...`)
3444
return await runBenchmark(
3545
`http://${SERVER_SIDE_RENDERED_HOST}:${SERVER_SIDE_RENDERED_PORT}`,
36-
`${config.package === 'app-next-js' ? 'next' : config.package === 'app-tanstack-start-react' ? 'tanstack-start' : config.package.slice(4)}-server-side-rendered`,
37-
config.displayName,
46+
name,
47+
displayName,
3848
runs,
39-
config.fullDocumentNavigation,
49+
app.fullDocumentNavigation ?? false,
4050
)
4151
} finally {
4252
killServer()

‎packages/stats-generator/src/serverSideRendered/run-benchmark.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ import type {
1313
ServerSideRenderedRunResult,
1414
} from './types.ts'
1515
import { assembleServerRendering } from '../server-rendering.ts'
16+
import { measurementsConfig } from '../measurements.ts'
1617

17-
const SERVER_SIDE_RENDERED_PATH = '/server-side-rendered'
18+
const SERVER_SIDE_RENDERED_PATH = measurementsConfig.serverSideRendered.path
1819

1920
function getBrowserVersion(chromiumPath: string): string | undefined {
2021
try {

0 commit comments

Comments
 (0)