Skip to content

Commit 4494177

Browse files
hkleungaihkleungai
authored
🤖 Merge PR DefinitelyTyped#72645 fix(node/net): add missing "error" to connectionAttemptFailed event by @hkleungai 
1 parent b8e4924 commit 4494177

File tree

4 files changed

+126
-12
lines changed

4 files changed

+126
-12
lines changed

‎types/node/net.d.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ declare module "net" {
377377
addListener(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
378378
addListener(
379379
event: "connectionAttemptFailed",
380-
listener: (ip: string, port: number, family: number) => void,
380+
listener: (ip: string, port: number, family: number, error: Error) => void,
381381
): this;
382382
addListener(
383383
event: "connectionAttemptTimeout",
@@ -397,7 +397,7 @@ declare module "net" {
397397
emit(event: "close", hadError: boolean): boolean;
398398
emit(event: "connect"): boolean;
399399
emit(event: "connectionAttempt", ip: string, port: number, family: number): boolean;
400-
emit(event: "connectionAttemptFailed", ip: string, port: number, family: number): boolean;
400+
emit(event: "connectionAttemptFailed", ip: string, port: number, family: number, error: Error): boolean;
401401
emit(event: "connectionAttemptTimeout", ip: string, port: number, family: number): boolean;
402402
emit(event: "data", data: Buffer): boolean;
403403
emit(event: "drain"): boolean;
@@ -410,7 +410,10 @@ declare module "net" {
410410
on(event: "close", listener: (hadError: boolean) => void): this;
411411
on(event: "connect", listener: () => void): this;
412412
on(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
413-
on(event: "connectionAttemptFailed", listener: (ip: string, port: number, family: number) => void): this;
413+
on(
414+
event: "connectionAttemptFailed",
415+
listener: (ip: string, port: number, family: number, error: Error) => void,
416+
): this;
414417
on(event: "connectionAttemptTimeout", listener: (ip: string, port: number, family: number) => void): this;
415418
on(event: "data", listener: (data: Buffer) => void): this;
416419
on(event: "drain", listener: () => void): this;
@@ -425,7 +428,10 @@ declare module "net" {
425428
once(event: string, listener: (...args: any[]) => void): this;
426429
once(event: "close", listener: (hadError: boolean) => void): this;
427430
once(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
428-
once(event: "connectionAttemptFailed", listener: (ip: string, port: number, family: number) => void): this;
431+
once(
432+
event: "connectionAttemptFailed",
433+
listener: (ip: string, port: number, family: number, error: Error) => void,
434+
): this;
429435
once(event: "connectionAttemptTimeout", listener: (ip: string, port: number, family: number) => void): this;
430436
once(event: "connect", listener: () => void): this;
431437
once(event: "data", listener: (data: Buffer) => void): this;
@@ -444,7 +450,7 @@ declare module "net" {
444450
prependListener(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
445451
prependListener(
446452
event: "connectionAttemptFailed",
447-
listener: (ip: string, port: number, family: number) => void,
453+
listener: (ip: string, port: number, family: number, error: Error) => void,
448454
): this;
449455
prependListener(
450456
event: "connectionAttemptTimeout",
@@ -469,7 +475,7 @@ declare module "net" {
469475
): this;
470476
prependOnceListener(
471477
event: "connectionAttemptFailed",
472-
listener: (ip: string, port: number, family: number) => void,
478+
listener: (ip: string, port: number, family: number, error: Error) => void,
473479
): this;
474480
prependOnceListener(
475481
event: "connectionAttemptTimeout",

‎types/node/test/net.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,16 @@ import * as net from "node:net";
177177
bool = had_error;
178178
});
179179
_socket = _socket.addListener("connect", () => {});
180+
_socket = _socket.addListener("connectionAttemptFailed", (ip, port, family, error) => {
181+
// $ExpectType string
182+
ip;
183+
// $ExpectType number
184+
port;
185+
// $ExpectType number
186+
family;
187+
// $ExpectType Error
188+
error;
189+
});
180190
_socket = _socket.addListener("data", data => {
181191
buffer = data;
182192
});
@@ -202,6 +212,7 @@ import * as net from "node:net";
202212
/// emit
203213
bool = _socket.emit("close", bool);
204214
bool = _socket.emit("connect");
215+
bool = _socket.emit("connectionAttemptFailed", str, num, num, error);
205216
bool = _socket.emit("data", buffer);
206217
bool = _socket.emit("drain");
207218
bool = _socket.emit("end");
@@ -216,6 +227,16 @@ import * as net from "node:net";
216227
bool = had_error;
217228
});
218229
_socket = _socket.on("connect", () => {});
230+
_socket = _socket.on("connectionAttemptFailed", (ip, port, family, error) => {
231+
// $ExpectType string
232+
ip;
233+
// $ExpectType number
234+
port;
235+
// $ExpectType number
236+
family;
237+
// $ExpectType Error
238+
error;
239+
});
219240
_socket = _socket.on("data", data => {
220241
buffer = data;
221242
});
@@ -243,6 +264,16 @@ import * as net from "node:net";
243264
bool = had_error;
244265
});
245266
_socket = _socket.once("connect", () => {});
267+
_socket = _socket.once("connectionAttemptFailed", (ip, port, family, error) => {
268+
// $ExpectType string
269+
ip;
270+
// $ExpectType number
271+
port;
272+
// $ExpectType number
273+
family;
274+
// $ExpectType Error
275+
error;
276+
});
246277
_socket = _socket.once("data", data => {
247278
buffer = data;
248279
});
@@ -270,6 +301,16 @@ import * as net from "node:net";
270301
bool = had_error;
271302
});
272303
_socket = _socket.prependListener("connect", () => {});
304+
_socket = _socket.prependListener("connectionAttemptFailed", (ip, port, family, error) => {
305+
// $ExpectType string
306+
ip;
307+
// $ExpectType number
308+
port;
309+
// $ExpectType number
310+
family;
311+
// $ExpectType Error
312+
error;
313+
});
273314
_socket = _socket.prependListener("data", data => {
274315
buffer = data;
275316
});
@@ -297,6 +338,16 @@ import * as net from "node:net";
297338
bool = had_error;
298339
});
299340
_socket = _socket.prependOnceListener("connect", () => {});
341+
_socket = _socket.prependOnceListener("connectionAttemptFailed", (ip, port, family, error) => {
342+
// $ExpectType string
343+
ip;
344+
// $ExpectType number
345+
port;
346+
// $ExpectType number
347+
family;
348+
// $ExpectType Error
349+
error;
350+
});
300351
_socket = _socket.prependOnceListener("data", data => {
301352
buffer = data;
302353
});

‎types/node/v20/net.d.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ declare module "net" {
380380
addListener(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
381381
addListener(
382382
event: "connectionAttemptFailed",
383-
listener: (ip: string, port: number, family: number) => void,
383+
listener: (ip: string, port: number, family: number, error: Error) => void,
384384
): this;
385385
addListener(
386386
event: "connectionAttemptTimeout",
@@ -400,7 +400,7 @@ declare module "net" {
400400
emit(event: "close", hadError: boolean): boolean;
401401
emit(event: "connect"): boolean;
402402
emit(event: "connectionAttempt", ip: string, port: number, family: number): boolean;
403-
emit(event: "connectionAttemptFailed", ip: string, port: number, family: number): boolean;
403+
emit(event: "connectionAttemptFailed", ip: string, port: number, family: number, error: Error): boolean;
404404
emit(event: "connectionAttemptTimeout", ip: string, port: number, family: number): boolean;
405405
emit(event: "data", data: Buffer): boolean;
406406
emit(event: "drain"): boolean;
@@ -413,7 +413,10 @@ declare module "net" {
413413
on(event: "close", listener: (hadError: boolean) => void): this;
414414
on(event: "connect", listener: () => void): this;
415415
on(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
416-
on(event: "connectionAttemptFailed", listener: (ip: string, port: number, family: number) => void): this;
416+
on(
417+
event: "connectionAttemptFailed",
418+
listener: (ip: string, port: number, family: number, error: Error) => void,
419+
): this;
417420
on(event: "connectionAttemptTimeout", listener: (ip: string, port: number, family: number) => void): this;
418421
on(event: "data", listener: (data: Buffer) => void): this;
419422
on(event: "drain", listener: () => void): this;
@@ -428,7 +431,10 @@ declare module "net" {
428431
once(event: string, listener: (...args: any[]) => void): this;
429432
once(event: "close", listener: (hadError: boolean) => void): this;
430433
once(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
431-
once(event: "connectionAttemptFailed", listener: (ip: string, port: number, family: number) => void): this;
434+
once(
435+
event: "connectionAttemptFailed",
436+
listener: (ip: string, port: number, family: number, error: Error) => void,
437+
): this;
432438
once(event: "connectionAttemptTimeout", listener: (ip: string, port: number, family: number) => void): this;
433439
once(event: "connect", listener: () => void): this;
434440
once(event: "data", listener: (data: Buffer) => void): this;
@@ -447,7 +453,7 @@ declare module "net" {
447453
prependListener(event: "connectionAttempt", listener: (ip: string, port: number, family: number) => void): this;
448454
prependListener(
449455
event: "connectionAttemptFailed",
450-
listener: (ip: string, port: number, family: number) => void,
456+
listener: (ip: string, port: number, family: number, error: Error) => void,
451457
): this;
452458
prependListener(
453459
event: "connectionAttemptTimeout",
@@ -472,7 +478,7 @@ declare module "net" {
472478
): this;
473479
prependOnceListener(
474480
event: "connectionAttemptFailed",
475-
listener: (ip: string, port: number, family: number) => void,
481+
listener: (ip: string, port: number, family: number, error: Error) => void,
476482
): this;
477483
prependOnceListener(
478484
event: "connectionAttemptTimeout",

‎types/node/v20/test/net.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,16 @@ import * as net from "node:net";
167167
bool = had_error;
168168
});
169169
_socket = _socket.addListener("connect", () => {});
170+
_socket = _socket.addListener("connectionAttemptFailed", (ip, port, family, error) => {
171+
// $ExpectType string
172+
ip;
173+
// $ExpectType number
174+
port;
175+
// $ExpectType number
176+
family;
177+
// $ExpectType Error
178+
error;
179+
});
170180
_socket = _socket.addListener("data", data => {
171181
buffer = data;
172182
});
@@ -192,6 +202,7 @@ import * as net from "node:net";
192202
/// emit
193203
bool = _socket.emit("close", bool);
194204
bool = _socket.emit("connect");
205+
bool = _socket.emit("connectionAttemptFailed", str, num, num, error);
195206
bool = _socket.emit("data", buffer);
196207
bool = _socket.emit("drain");
197208
bool = _socket.emit("end");
@@ -206,6 +217,16 @@ import * as net from "node:net";
206217
bool = had_error;
207218
});
208219
_socket = _socket.on("connect", () => {});
220+
_socket = _socket.on("connectionAttemptFailed", (ip, port, family, error) => {
221+
// $ExpectType string
222+
ip;
223+
// $ExpectType number
224+
port;
225+
// $ExpectType number
226+
family;
227+
// $ExpectType Error
228+
error;
229+
});
209230
_socket = _socket.on("data", data => {
210231
buffer = data;
211232
});
@@ -233,6 +254,16 @@ import * as net from "node:net";
233254
bool = had_error;
234255
});
235256
_socket = _socket.once("connect", () => {});
257+
_socket = _socket.once("connectionAttemptFailed", (ip, port, family, error) => {
258+
// $ExpectType string
259+
ip;
260+
// $ExpectType number
261+
port;
262+
// $ExpectType number
263+
family;
264+
// $ExpectType Error
265+
error;
266+
});
236267
_socket = _socket.once("data", data => {
237268
buffer = data;
238269
});
@@ -260,6 +291,16 @@ import * as net from "node:net";
260291
bool = had_error;
261292
});
262293
_socket = _socket.prependListener("connect", () => {});
294+
_socket = _socket.prependListener("connectionAttemptFailed", (ip, port, family, error) => {
295+
// $ExpectType string
296+
ip;
297+
// $ExpectType number
298+
port;
299+
// $ExpectType number
300+
family;
301+
// $ExpectType Error
302+
error;
303+
});
263304
_socket = _socket.prependListener("data", data => {
264305
buffer = data;
265306
});
@@ -287,6 +328,16 @@ import * as net from "node:net";
287328
bool = had_error;
288329
});
289330
_socket = _socket.prependOnceListener("connect", () => {});
331+
_socket = _socket.prependOnceListener("connectionAttemptFailed", (ip, port, family, error) => {
332+
// $ExpectType string
333+
ip;
334+
// $ExpectType number
335+
port;
336+
// $ExpectType number
337+
family;
338+
// $ExpectType Error
339+
error;
340+
});
290341
_socket = _socket.prependOnceListener("data", data => {
291342
buffer = data;
292343
});

0 commit comments

Comments
 (0)