diff options
| -rw-r--r-- | .changeset/olive-knives-rush.md | 5 | ||||
| -rw-r--r-- | packages/integrations/node/src/nodeMiddleware.ts | 26 | ||||
| -rw-r--r-- | packages/integrations/node/src/types.ts | 11 |
3 files changed, 34 insertions, 8 deletions
diff --git a/.changeset/olive-knives-rush.md b/.changeset/olive-knives-rush.md new file mode 100644 index 000000000..af8022ba0 --- /dev/null +++ b/.changeset/olive-knives-rush.md @@ -0,0 +1,5 @@ +--- +'@astrojs/node': patch +--- + +fix issuse #7590 "res.writeHead is not a function" in Express/Node middleware diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts index 8d31b6806..fa0cdfda8 100644 --- a/packages/integrations/node/src/nodeMiddleware.ts +++ b/packages/integrations/node/src/nodeMiddleware.ts @@ -1,19 +1,29 @@ import type { NodeApp } from 'astro/app/node'; -import type { IncomingMessage, ServerResponse } from 'node:http'; +import type { ServerResponse } from 'node:http'; import type { Readable } from 'stream'; import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders'; import { responseIterator } from './response-iterator'; -import type { Options } from './types'; +import type { ErrorHandlerParams, Options, RequestHandlerParams } from './types'; // Disable no-unused-vars to avoid breaking signature change // eslint-disable-next-line @typescript-eslint/no-unused-vars export default function (app: NodeApp, _mode: Options['mode']) { - return async function ( - req: IncomingMessage, - res: ServerResponse, - next?: (err?: unknown) => void, - locals?: object - ) { + return async function (...args: RequestHandlerParams | ErrorHandlerParams) { + let error = null; + let [req, res, next, locals] = args as RequestHandlerParams; + + if (args[0] instanceof Error) { + [error, req, res, next, locals] = args as ErrorHandlerParams; + + if (error) { + if (next) { + return next(error); + } else { + throw error; + } + } + } + try { const route = app.match(req); if (route) { diff --git a/packages/integrations/node/src/types.ts b/packages/integrations/node/src/types.ts index 2a9ecc2a1..b0bd4a681 100644 --- a/packages/integrations/node/src/types.ts +++ b/packages/integrations/node/src/types.ts @@ -1,3 +1,5 @@ +import { IncomingMessage, ServerResponse } from 'node:http'; + export interface UserOptions { /** * Specifies the mode that the adapter builds to. @@ -14,3 +16,12 @@ export interface Options extends UserOptions { server: string; client: string; } + +export type RequestHandlerParams = [ + req: IncomingMessage, + res: ServerResponse, + next?: (err?: unknown) => void, + locals?: object +]; + +export type ErrorHandlerParams = [unknown, ...RequestHandlerParams]; |