Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions src/adapters/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class NodeServer implements Server {
errorPlugin(this);

const fetchHandler = (this.fetch = wrapFetch(this));

const handler = (nodeReq: NodeServerRequest, nodeRes: NodeServerResponse) => {
const request = new NodeRequest({ req: nodeReq, res: nodeRes });
request.waitUntil = this.#wait?.waitUntil;
Expand Down Expand Up @@ -120,20 +119,37 @@ class NodeServer implements Server {
this.node.server = server;

if (!options.manual) {
this.serve();
this.serve().catch(() => {});
}
}

serve() {
serve(): Promise<this> {
if (this.#listeningPromise) {
return Promise.resolve(this.#listeningPromise).then(() => this);
return this.#listeningPromise.then(() => this);
}
this.#listeningPromise = new Promise<void>((resolve) => {
this.node!.server!.listen(this.serveOptions, () => {

const server = this.node?.server as
| NodeHttp.Server
| NodeHttps.Server
| NodeHttp2.Http2SecureServer;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
this.#listeningPromise = new Promise<void>((resolve, reject) => {
const onError = (error: Error) => {
server.off("listening", onListening);
reject(error);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
};

const onListening = () => {
server.off("error", onError);
printListening(this.options, this.url);
resolve();
});
};

server.once("error", onError);
server.once("listening", onListening);
server.listen(this.serveOptions);
});

return this.#listeningPromise.then(() => this);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

get url() {
Expand Down
41 changes: 41 additions & 0 deletions test/node-adapters.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { createServer } from "node:http";
import { describe, expect, test } from "vitest";
import { getRandomPort } from "get-port-please";
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

import type { NodeHttp1Handler, NodeServerRequest, NodeServerResponse } from "../src/types.ts";
import { fetchNodeHandler, serve, toNodeHandler, toFetchHandler } from "../src/adapters/node.ts";
Expand Down Expand Up @@ -257,3 +259,42 @@ describe("request signal", () => {
await server.close(true); // Force close all connections
});
});

describe("node server startup", () => {
test("port conflict rejects with EADDRINUSE", async () => {
const port = await getRandomPort("localhost");
const blocker = createServer((_req, res) => res.end("blocked"));

await new Promise<void>((resolve) => blocker.listen(port, "127.0.0.1", () => resolve()));

try {
const server = serve({
port,
hostname: "127.0.0.1",
manual: true,
fetch: () => new Response(""),
});
await expect(server.serve()).rejects.toMatchObject({ code: "EADDRINUSE" });
} finally {
await new Promise<void>((resolve) => blocker.close(() => resolve()));
}
});

test("auto-serve port conflict surfaces via ready()", async () => {
const port = await getRandomPort("localhost");
const blocker = createServer((_req, res) => res.end("blocked"));

await new Promise<void>((resolve) => blocker.listen(port, "127.0.0.1", () => resolve()));

try {
const server = serve({
port,
hostname: "127.0.0.1",
fetch: () => new Response(""),
});
await expect(server.ready()).rejects.toMatchObject({ code: "EADDRINUSE" });
} finally {
await new Promise<void>((resolve) => blocker.close(() => resolve()));
}
});
});