Unverified Commit 895f104b authored by Dima Voytenko's avatar Dima Voytenko Committed by GitHub

Testmode: intercept rewrite fetches (#54259)

The test mode should allow interception of all fetches made by the
server, including rewrites.

---------
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 0c85f8aa
...@@ -61,12 +61,17 @@ export const test = base.extend<{ ...@@ -61,12 +61,17 @@ export const test = base.extend<{
referrer, referrer,
referrerPolicy, referrerPolicy,
}) })
let isUnhandled = false
let isPassthrough = false let isPassthrough = false
let mockedResponse: MockedResponse | undefined let mockedResponse: MockedResponse | undefined
await handleRequest( await handleRequest(
mockedRequest, mockedRequest,
handlers.slice(0), handlers.slice(0),
{ onUnhandledRequest: 'error' }, {
onUnhandledRequest: () => {
isUnhandled = true
},
},
emitter as any, emitter as any,
{ {
onPassthroughResponse: () => { onPassthroughResponse: () => {
...@@ -78,6 +83,9 @@ export const test = base.extend<{ ...@@ -78,6 +83,9 @@ export const test = base.extend<{
} }
) )
if (isUnhandled) {
return undefined
}
if (isPassthrough) { if (isPassthrough) {
return 'continue' return 'continue'
} }
......
import { AsyncLocalStorage } from 'async_hooks' import { AsyncLocalStorage } from 'async_hooks'
import { NodeRequestHandler } from '../../server/next-server'
import type { import type {
ProxyFetchRequest, ProxyFetchRequest,
ProxyFetchResponse, ProxyFetchResponse,
ProxyResponse, ProxyResponse,
} from './proxy' } from './proxy'
import { ClientRequestInterceptor } from 'next/dist/compiled/@mswjs/interceptors/ClientRequest' import { ClientRequestInterceptor } from 'next/dist/compiled/@mswjs/interceptors/ClientRequest'
import { WorkerRequestHandler } from '../../server/lib/setup-server-worker'
import { NodeRequestHandler } from '../../server/next-server'
interface TestReqInfo { interface TestReqInfo {
url: string url: string
...@@ -92,7 +93,9 @@ async function handleFetch( ...@@ -92,7 +93,9 @@ async function handleFetch(
return originalFetch(request) return originalFetch(request)
case 'abort': case 'abort':
case 'unhandled': case 'unhandled':
throw new Error('Proxy request aborted') throw new Error(
`Proxy request aborted [${request.method} ${request.url}]`
)
default: default:
break break
} }
...@@ -132,7 +135,29 @@ export function interceptTestApis(): () => void { ...@@ -132,7 +135,29 @@ export function interceptTestApis(): () => void {
} }
} }
export function wrapRequestHandler( export function wrapRequestHandlerWorker(
handler: WorkerRequestHandler
): WorkerRequestHandler {
return async (req, res) => {
const proxyPortHeader = req.headers['next-test-proxy-port']
if (!proxyPortHeader) {
await handler(req, res)
return
}
const url = req.url ?? ''
const proxyPort = Number(proxyPortHeader)
const testData = (req.headers['next-test-data'] as string | undefined) ?? ''
const testReqInfo: TestReqInfo = {
url,
proxyPort,
testData,
}
await testStorage.run(testReqInfo, () => handler(req, res))
}
}
export function wrapRequestHandlerNode(
handler: NodeRequestHandler handler: NodeRequestHandler
): NodeRequestHandler { ): NodeRequestHandler {
return async (req, res, parsedUrl) => { return async (req, res, parsedUrl) => {
......
...@@ -302,7 +302,7 @@ export async function initialize(opts: { ...@@ -302,7 +302,7 @@ export async function initialize(opts: {
devInstance?.ensureMiddleware devInstance?.ensureMiddleware
) )
const requestHandler: WorkerRequestHandler = async (req, res) => { const requestHandlerImpl: WorkerRequestHandler = async (req, res) => {
if (compress) { if (compress) {
// @ts-expect-error not express req/res // @ts-expect-error not express req/res
compress(req, res, () => {}) compress(req, res, () => {})
...@@ -718,6 +718,17 @@ export async function initialize(opts: { ...@@ -718,6 +718,17 @@ export async function initialize(opts: {
} }
} }
let requestHandler: WorkerRequestHandler = requestHandlerImpl
if (opts.experimentalTestProxy) {
// Intercept fetch and other testmode apis.
const {
wrapRequestHandlerWorker,
interceptTestApis,
} = require('../../experimental/testmode/server')
requestHandler = wrapRequestHandlerWorker(requestHandler)
interceptTestApis()
}
const upgradeHandler: WorkerUpgradeHandler = async (req, socket, head) => { const upgradeHandler: WorkerUpgradeHandler = async (req, socket, head) => {
try { try {
req.on('error', (_err) => { req.on('error', (_err) => {
......
...@@ -1073,8 +1073,10 @@ export default class NextNodeServer extends BaseServer { ...@@ -1073,8 +1073,10 @@ export default class NextNodeServer extends BaseServer {
public getRequestHandler(): NodeRequestHandler { public getRequestHandler(): NodeRequestHandler {
const handler = this.makeRequestHandler() const handler = this.makeRequestHandler()
if (this.serverOptions.experimentalTestProxy) { if (this.serverOptions.experimentalTestProxy) {
const { wrapRequestHandler } = require('../experimental/testmode/server') const {
return wrapRequestHandler(handler) wrapRequestHandlerNode,
} = require('../experimental/testmode/server')
return wrapRequestHandlerNode(handler)
} }
return handler return handler
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment