7584b02b34
* Refactor data fetching to support getting headers * Relax `getNextPathnameInfo` type * Add test for middleware internal redirects * Export `ParsedRelativeUrl` type * Refactor `getMiddlewareEffects` * Move rewrite i18n test to middleware rewrite tests * Fix bug parsing pathname info * Normalize data requests to page requests for middleware * Ensure there is a header `x-nextjs-matched-path` for middleware rewrites on data requests * Extract `getDataHref` to a function * Stop using `getDataHref` for flight * Always set the query in `dataHref` independently of if it is SSG * Add test for recursive rewrites * Refactor dynamicPath validation to `matchHrefAndAsPath` * Add `dataHref` to `FetchDataOutput` * Extract `matchesMiddleware` function * Add `hasMiddleware` option to `fetchNextData` * Move preflight test * Remove preflight test * Add middleware prefetch tests * Remove preflight * Attempt to reduce bundle size Include `withMiddlewareEffects` and `matchHrefAndAsPath` into `router` Bring `getDataHref` back to `page-loader` Bring `resolveDynamicRoute` back to `router` * Reduce arg duplication for `withMiddlewareEffects` * Remove some async/await and spreads to reduce bundle size * Upgrade `edge-runtime` & clone `Request` on redirects to mutate headers * Add some rewrite tests Co-authored-by: Kiko Beats <josefrancisco.verdu@gmail.com> Co-authored-by: JJ Kasper <jj@jjsweb.site>
118 lines
2.3 KiB
TypeScript
118 lines
2.3 KiB
TypeScript
import type { I18NConfig } from '../../config-shared'
|
|
import type { RequestData } from '../types'
|
|
import { NextURL } from '../next-url'
|
|
import { isBot } from '../../utils'
|
|
import { toNodeHeaders, validateURL } from '../utils'
|
|
import parseua from 'next/dist/compiled/ua-parser-js'
|
|
import { DeprecationPageError } from '../error'
|
|
|
|
import { NextCookies } from './cookies'
|
|
|
|
export const INTERNALS = Symbol('internal request')
|
|
|
|
export class NextRequest extends Request {
|
|
[INTERNALS]: {
|
|
cookies: NextCookies
|
|
geo: RequestData['geo']
|
|
ip?: string
|
|
ua?: UserAgent | null
|
|
url: NextURL
|
|
}
|
|
|
|
constructor(input: Request | string, init: RequestInit = {}) {
|
|
const url = typeof input === 'string' ? input : input.url
|
|
validateURL(url)
|
|
super(input, init)
|
|
this[INTERNALS] = {
|
|
cookies: new NextCookies(this),
|
|
geo: init.geo || {},
|
|
ip: init.ip,
|
|
url: new NextURL(url, {
|
|
headers: toNodeHeaders(this.headers),
|
|
nextConfig: init.nextConfig,
|
|
}),
|
|
}
|
|
}
|
|
|
|
public get cookies() {
|
|
return this[INTERNALS].cookies
|
|
}
|
|
|
|
public get geo() {
|
|
return this[INTERNALS].geo
|
|
}
|
|
|
|
public get ip() {
|
|
return this[INTERNALS].ip
|
|
}
|
|
|
|
public get nextUrl() {
|
|
return this[INTERNALS].url
|
|
}
|
|
|
|
public get page() {
|
|
throw new DeprecationPageError()
|
|
}
|
|
|
|
public get ua() {
|
|
if (typeof this[INTERNALS].ua !== 'undefined') {
|
|
return this[INTERNALS].ua || undefined
|
|
}
|
|
|
|
const uaString = this.headers.get('user-agent')
|
|
if (!uaString) {
|
|
this[INTERNALS].ua = null
|
|
return this[INTERNALS].ua || undefined
|
|
}
|
|
|
|
this[INTERNALS].ua = {
|
|
...parseua(uaString),
|
|
isBot: isBot(uaString),
|
|
}
|
|
|
|
return this[INTERNALS].ua
|
|
}
|
|
|
|
public get url() {
|
|
return this[INTERNALS].url.toString()
|
|
}
|
|
}
|
|
|
|
export interface RequestInit extends globalThis.RequestInit {
|
|
geo?: {
|
|
city?: string
|
|
country?: string
|
|
region?: string
|
|
}
|
|
ip?: string
|
|
nextConfig?: {
|
|
basePath?: string
|
|
i18n?: I18NConfig | null
|
|
trailingSlash?: boolean
|
|
}
|
|
}
|
|
|
|
interface UserAgent {
|
|
isBot: boolean
|
|
ua: string
|
|
browser: {
|
|
name?: string
|
|
version?: string
|
|
}
|
|
device: {
|
|
model?: string
|
|
type?: string
|
|
vendor?: string
|
|
}
|
|
engine: {
|
|
name?: string
|
|
version?: string
|
|
}
|
|
os: {
|
|
name?: string
|
|
version?: string
|
|
}
|
|
cpu: {
|
|
architecture?: string
|
|
}
|
|
}
|