summaryrefslogtreecommitdiff
path: root/packages/integrations/node/src
diff options
context:
space:
mode:
authorGravatar DixCouleur <DixCouleur@qq.com> 2023-08-02 06:10:29 +0800
committerGravatar GitHub <noreply@github.com> 2023-08-01 17:10:29 -0500
commit2a4950399999cd7f26718e74d45ab27c2c78acff (patch)
tree6023f1b58928cfec53562decfc1035e6bd6f3a9f /packages/integrations/node/src
parente33b887b85ba3849ef0e46bbc8839cc29ff34081 (diff)
downloadastro-2a4950399999cd7f26718e74d45ab27c2c78acff.tar.gz
astro-2a4950399999cd7f26718e74d45ab27c2c78acff.tar.zst
astro-2a4950399999cd7f26718e74d45ab27c2c78acff.zip
Fix "res.writeHead is not a function" in Express/node middleware (#7708)
* fix: res.writeHead is not a function * fix: handler params type added * fix: handler function params error * Update packages/integrations/node/src/nodeMiddleware.ts --------- Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
Diffstat (limited to 'packages/integrations/node/src')
-rw-r--r--packages/integrations/node/src/nodeMiddleware.ts26
-rw-r--r--packages/integrations/node/src/types.ts11
2 files changed, 29 insertions, 8 deletions
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];