Skip to content

[pull] master from DefinitelyTyped:master #1767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 7, 2026
Merged

[pull] master from DefinitelyTyped:master #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion types/node/http2.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,10 @@ declare module "node:http2" {
"checkContinue": [request: InstanceType<Http2Request>, response: InstanceType<Http2Response>];
"request": [request: InstanceType<Http2Request>, response: InstanceType<Http2Response>];
"session": [session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>];
"sessionError": [err: Error];
"sessionError": [
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
];
}
interface Http2Server<
Http1Request extends typeof IncomingMessage = typeof IncomingMessage,
Expand Down
2 changes: 1 addition & 1 deletion types/node/node-tests/http2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ import { URL } from "node:url";
const s1: Server = http2Server;
const s2: Server = http2SecureServer;
[http2Server, http2SecureServer].forEach((server) => {
server.on("sessionError", (err: Error) => {});
server.on("sessionError", (err: Error, session: ServerHttp2Session) => {});
server.on("session", (session: ServerHttp2Session) => {});
server.on("checkContinue", (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => {});
server.on(
Expand Down
92 changes: 80 additions & 12 deletions types/node/v20/http2.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
addListener(event: "sessionError", listener: (err: Error) => void): this;
addListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
addListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1398,7 +1404,11 @@ declare module "http2" {
event: "session",
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "sessionError", err: Error): boolean;
emit(
event: "sessionError",
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
emit(event: "timeout"): boolean;
emit(event: string | symbol, ...args: any[]): boolean;
Expand All @@ -1414,7 +1424,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
on(event: "sessionError", listener: (err: Error) => void): this;
on(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
on(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1433,7 +1449,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
once(event: "sessionError", listener: (err: Error) => void): this;
once(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
once(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1452,7 +1474,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependListener(event: "sessionError", listener: (err: Error) => void): this;
prependListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1471,7 +1499,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
prependOnceListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependOnceListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1497,7 +1531,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
addListener(event: "sessionError", listener: (err: Error) => void): this;
addListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
addListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1515,7 +1555,11 @@ declare module "http2" {
event: "session",
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "sessionError", err: Error): boolean;
emit(
event: "sessionError",
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
emit(event: "timeout"): boolean;
emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
Expand All @@ -1532,7 +1576,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
on(event: "sessionError", listener: (err: Error) => void): this;
on(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
on(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1552,7 +1602,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
once(event: "sessionError", listener: (err: Error) => void): this;
once(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
once(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1572,7 +1628,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependListener(event: "sessionError", listener: (err: Error) => void): this;
prependListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1592,7 +1654,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
prependOnceListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependOnceListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand Down
2 changes: 1 addition & 1 deletion types/node/v20/test/http2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ import { URL } from "node:url";
const s1: Server = http2Server;
const s2: Server = http2SecureServer;
[http2Server, http2SecureServer].forEach((server) => {
server.on("sessionError", (err: Error) => {});
server.on("sessionError", (err: Error, session: ServerHttp2Session) => {});
server.on("session", (session: ServerHttp2Session) => {});
server.on("checkContinue", (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => {});
server.on("stream", (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => {});
Expand Down
92 changes: 80 additions & 12 deletions types/node/v22/http2.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,7 +1394,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
addListener(event: "sessionError", listener: (err: Error) => void): this;
addListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
addListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1411,7 +1417,11 @@ declare module "http2" {
event: "session",
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "sessionError", err: Error): boolean;
emit(
event: "sessionError",
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
emit(event: "timeout"): boolean;
emit(event: string | symbol, ...args: any[]): boolean;
Expand All @@ -1427,7 +1437,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
on(event: "sessionError", listener: (err: Error) => void): this;
on(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
on(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1446,7 +1462,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
once(event: "sessionError", listener: (err: Error) => void): this;
once(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
once(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1465,7 +1487,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependListener(event: "sessionError", listener: (err: Error) => void): this;
prependListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1484,7 +1512,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
prependOnceListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependOnceListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1510,7 +1544,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
addListener(event: "sessionError", listener: (err: Error) => void): this;
addListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
addListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1528,7 +1568,11 @@ declare module "http2" {
event: "session",
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "sessionError", err: Error): boolean;
emit(
event: "sessionError",
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
): boolean;
emit(event: "stream", stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
emit(event: "timeout"): boolean;
emit(event: "unknownProtocol", socket: tls.TLSSocket): boolean;
Expand All @@ -1545,7 +1589,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
on(event: "sessionError", listener: (err: Error) => void): this;
on(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
on(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1565,7 +1615,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
once(event: "sessionError", listener: (err: Error) => void): this;
once(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
once(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1585,7 +1641,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependListener(event: "sessionError", listener: (err: Error) => void): this;
prependListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand All @@ -1605,7 +1667,13 @@ declare module "http2" {
event: "session",
listener: (session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>) => void,
): this;
prependOnceListener(event: "sessionError", listener: (err: Error) => void): this;
prependOnceListener(
event: "sessionError",
listener: (
err: Error,
session: ServerHttp2Session<Http1Request, Http1Response, Http2Request, Http2Response>,
) => void,
): this;
prependOnceListener(
event: "stream",
listener: (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void,
Expand Down
2 changes: 1 addition & 1 deletion types/node/v22/test/http2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ import { URL } from "node:url";
const s1: Server = http2Server;
const s2: Server = http2SecureServer;
[http2Server, http2SecureServer].forEach((server) => {
server.on("sessionError", (err: Error) => {});
server.on("sessionError", (err: Error, session: ServerHttp2Session) => {});
server.on("session", (session: ServerHttp2Session) => {});
server.on("checkContinue", (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => {});
server.on("stream", (stream: ServerHttp2Stream, headers: IncomingHttpHeaders, flags: number) => {});
Expand Down
Loading