1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-21 23:04:45 -05:00

BREAKING(net): remove Deno.[Tls]Listener.prototype.rid (#25556)

Towards #22079

---------

Signed-off-by: Asher Gomez <ashersaupingomez@gmail.com>
This commit is contained in:
Asher Gomez 2024-09-11 09:14:50 +10:00 committed by GitHub
parent ace1202227
commit 4865ae13e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 1 additions and 63 deletions

View file

@ -1,6 +1,6 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { core, internals, primordials } from "ext:core/mod.js";
import { core, primordials } from "ext:core/mod.js";
const {
BadResourcePrototype,
InterruptedPrototype,
@ -237,13 +237,6 @@ class Listener {
#promise = null;
constructor(rid, addr) {
if (internals.future) {
ObjectDefineProperty(this, "rid", {
__proto__: null,
enumerable: false,
value: undefined,
});
}
ObjectDefineProperty(this, internalRidSymbol, {
__proto__: null,
enumerable: false,
@ -253,15 +246,6 @@ class Listener {
this.#addr = addr;
}
get rid() {
internals.warnOnDeprecatedApi(
"Deno.Listener.rid",
new Error().stack,
"Use `Deno.Listener` instance methods instead.",
);
return this.#rid;
}
get addr() {
return this.#addr;
}

View file

@ -86,15 +86,6 @@ class TlsListener extends Listener {
this.#rid = rid;
}
get rid() {
internals.warnOnDeprecatedApi(
"Deno.TlsListener.rid",
new Error().stack,
"Use `Deno.TlsListener` instance methods instead.",
);
return this.#rid;
}
async accept() {
const { 0: rid, 1: localAddr, 2: remoteAddr } = await op_net_accept_tls(
this.#rid,

View file

@ -35,15 +35,6 @@ declare namespace Deno {
/** Return the address of the `Listener`. */
readonly addr: A;
/**
* Return the rid of the `Listener`.
*
* @deprecated This will be removed in Deno 2.0. See the
* {@link https://docs.deno.com/runtime/manual/advanced/migrate_deprecations | Deno 1.x to 2.x Migration Guide}
* for migration instructions.
*/
readonly rid: number;
[Symbol.asyncIterator](): AsyncIterableIterator<T>;
/**

View file

@ -1,24 +1,5 @@
console.log("window is", globalThis.window);
// TCP
// Since these tests may run in parallel, ensure this port is unique to this file
const tcpPort = 4509;
const tcpListener = Deno.listen({ port: tcpPort });
console.log("Deno.Listener.prototype.rid is", tcpListener.rid);
tcpListener.close();
// TLS
// Since these tests may run in parallel, ensure this port is unique to this file
const tlsPort = 4510;
const cert = Deno.readTextFileSync(
new URL("../../../testdata/tls/localhost.crt", import.meta.url),
);
const key = Deno.readTextFileSync(
new URL("../../../testdata/tls/localhost.key", import.meta.url),
);
const tlsListener = Deno.listenTls({ port: tlsPort, cert, key });
console.log("Deno.TlsListener.prototype.rid is", tlsListener.rid);
try {
new Deno.FsFile(0);
} catch (error) {
@ -31,6 +12,4 @@ try {
}
}
tlsListener.close();
self.close();

View file

@ -1,4 +1,2 @@
window is undefined
Deno.Listener.prototype.rid is undefined
Deno.TlsListener.prototype.rid is undefined
Deno.FsFile constructor is illegal

View file

@ -2,11 +2,9 @@
import {
assert,
assertEquals,
assertNotEquals,
assertRejects,
assertThrows,
delay,
DENO_FUTURE,
execCode,
execCode2,
tmpUnixSocketPath,
@ -28,9 +26,6 @@ Deno.test({ permissions: { net: true } }, function netTcpListenClose() {
assert(listener.addr.transport === "tcp");
assertEquals(listener.addr.hostname, "127.0.0.1");
assertEquals(listener.addr.port, listenPort);
if (!DENO_FUTURE) {
assertNotEquals(listener.rid, 0);
}
listener.close();
});