-
-
Notifications
You must be signed in to change notification settings - Fork 35.7k
net: add experimental net/promises API #63965
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.
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
base: main
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| 'use strict'; | ||
|
|
||
| const { once } = require('events'); | ||
| const { | ||
| validateAbortSignal, | ||
| validateObject, | ||
| } = require('internal/validators'); | ||
| const { AbortError } = require('internal/errors'); | ||
| const { kEmptyObject } = require('internal/util'); | ||
|
|
||
| // Lazily loaded to avoid a require cycle with the `net` module, which exposes | ||
| // this namespace through its `promises` getter. | ||
| let net; | ||
| function lazyNet() { | ||
| net ??= require('net'); | ||
| return net; | ||
| } | ||
|
|
||
| // Resolves with a connected `net.Socket` once the `'connect'` event fires, and | ||
| // rejects if the connection fails or the optional `signal` is aborted. | ||
| async function connect(...args) { | ||
| const lazy = lazyNet(); | ||
| const options = lazy._normalizeArgs(args)[0]; | ||
| const { signal } = options; | ||
| if (signal !== undefined) { | ||
| validateAbortSignal(signal, 'options.signal'); | ||
| if (signal.aborted) { | ||
| throw new AbortError(undefined, { cause: signal.reason }); | ||
| } | ||
| } | ||
|
|
||
| // Strip the signal so the socket does not also install its own abort | ||
| // handling; rejecting and destroying below fully tears the socket down. | ||
| const socket = lazy.connect({ ...options, signal: undefined }); | ||
|
|
||
| try { | ||
| await once(socket, 'connect', signal !== undefined ? { signal } : kEmptyObject); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No I believe this correctly rejects. The |
||
| } catch (err) { | ||
| socket.destroy(); | ||
| throw err; | ||
| } | ||
| return socket; | ||
| } | ||
|
|
||
| // Creates a server and resolves with it once it is listening, rejecting if it | ||
| // fails to bind or the optional `signal` is aborted. | ||
| async function listen(options = kEmptyObject) { | ||
| validateObject(options, 'options'); | ||
| const { signal, connectionListener } = options; | ||
| if (signal !== undefined) { | ||
| validateAbortSignal(signal, 'options.signal'); | ||
| if (signal.aborted) { | ||
|
Ethan-Arrowood marked this conversation as resolved.
Outdated
|
||
| throw new AbortError(undefined, { cause: signal.reason }); | ||
| } | ||
| } | ||
|
|
||
| const lazy = lazyNet(); | ||
| // Strip the signal so listen() does not install its own close-on-abort | ||
| // handler; rejecting and closing below tears the server down. | ||
| const serverOptions = { ...options, signal: undefined }; | ||
| const server = lazy.createServer(serverOptions, connectionListener); | ||
|
|
||
| try { | ||
| server.listen(serverOptions); | ||
| await once(server, 'listening', signal !== undefined ? { signal } : kEmptyObject); | ||
| } catch (err) { | ||
| server.close(); | ||
| throw err; | ||
| } | ||
| return server; | ||
| } | ||
|
|
||
| module.exports = { | ||
| connect, | ||
| listen, | ||
| get isIP() { return lazyNet().isIP; }, | ||
| get isIPv4() { return lazyNet().isIPv4; }, | ||
| get isIPv6() { return lazyNet().isIPv6; }, | ||
| get BlockList() { return lazyNet().BlockList; }, | ||
| get SocketAddress() { return lazyNet().SocketAddress; }, | ||
| }; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| 'use strict'; | ||
|
|
||
| module.exports = require('internal/net/promises'); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| 'use strict'; | ||
| const common = require('../common'); | ||
| const assert = require('assert'); | ||
| const net = require('net'); | ||
| const { once } = require('events'); | ||
| const { connect } = require('net/promises'); | ||
|
|
||
| (async () => { | ||
| // Resolves with a connected socket and round-trips data. | ||
| { | ||
| const server = net.createServer((socket) => { | ||
| socket.end('hello'); | ||
| }).listen(0); | ||
| await once(server, 'listening'); | ||
| const socket = await connect({ port: server.address().port }); | ||
| assert.strictEqual(socket.connecting, false); | ||
| const chunks = []; | ||
| for await (const chunk of socket) { | ||
| chunks.push(chunk); | ||
| } | ||
| assert.strictEqual(Buffer.concat(chunks).toString(), 'hello'); | ||
| server.close(); | ||
| } | ||
|
|
||
| // net.promises is the same object as require('net/promises'). | ||
| assert.strictEqual(net.promises, require('net/promises')); | ||
|
|
||
| // Rejects when the connection is refused. | ||
| { | ||
| const server = net.createServer().listen(0); | ||
| await once(server, 'listening'); | ||
| const { port } = server.address(); | ||
| server.close(); | ||
| await once(server, 'close'); | ||
| await assert.rejects(connect({ port }), { code: 'ECONNREFUSED' }); | ||
| } | ||
|
|
||
| // A pre-aborted signal rejects with an AbortError. | ||
| { | ||
| await assert.rejects( | ||
| connect({ port: 0, signal: AbortSignal.abort() }), | ||
| { name: 'AbortError' }); | ||
| } | ||
|
|
||
| // Aborting while connecting rejects with an AbortError. | ||
| { | ||
| const server = net.createServer().listen(0); | ||
| await once(server, 'listening'); | ||
| const controller = new AbortController(); | ||
| const promise = connect({ port: server.address().port, signal: controller.signal }); | ||
| controller.abort(); | ||
| await assert.rejects(promise, { name: 'AbortError' }); | ||
| server.close(); | ||
| } | ||
|
|
||
| // An invalid signal throws. | ||
| { | ||
| await assert.rejects( | ||
| connect({ port: 0, signal: 'INVALID_SIGNAL' }), | ||
| { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| } | ||
| })().then(common.mustCall()); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| 'use strict'; | ||
| const common = require('../common'); | ||
| const assert = require('assert'); | ||
| const net = require('net'); | ||
| const { listen } = require('net/promises'); | ||
|
|
||
| (async () => { | ||
| // Resolves with a listening server. | ||
| { | ||
| const server = await listen({ port: 0 }); | ||
| assert.strictEqual(server.listening, true); | ||
| assert.strictEqual(typeof server.address().port, 'number'); | ||
| server.close(); | ||
| } | ||
|
|
||
| // The connectionListener option receives incoming connections. | ||
| { | ||
| const server = await listen({ | ||
| port: 0, | ||
| connectionListener: common.mustCall((socket) => { | ||
| socket.end(); | ||
| server.close(); | ||
| }), | ||
| }); | ||
| const client = net.connect(server.address().port); | ||
| client.resume(); | ||
| } | ||
|
|
||
| // A pre-aborted signal rejects with an AbortError. | ||
| { | ||
| await assert.rejects( | ||
| listen({ port: 0, signal: AbortSignal.abort() }), | ||
| { name: 'AbortError' }); | ||
| } | ||
|
|
||
| // Aborting while binding rejects with an AbortError and closes the server. | ||
| { | ||
| const controller = new AbortController(); | ||
| const promise = listen({ port: 0, signal: controller.signal }); | ||
| controller.abort(); | ||
| await assert.rejects(promise, { name: 'AbortError' }); | ||
| } | ||
|
|
||
| // An invalid signal throws. | ||
| { | ||
| await assert.rejects( | ||
| listen({ port: 0, signal: 'INVALID_SIGNAL' }), | ||
| { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| } | ||
|
|
||
| // Rejects when the address is already in use. | ||
| { | ||
| const first = await listen({ port: 0 }); | ||
| const { port } = first.address(); | ||
| await assert.rejects(listen({ port }), { code: 'EADDRINUSE' }); | ||
| first.close(); | ||
| } | ||
| })().then(common.mustCall()); |
Uh oh!
There was an error while loading. Please reload this page.