Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
18 changes: 1 addition & 17 deletions ext/net/01_net.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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;
}
Expand Down
9 changes: 0 additions & 9 deletions ext/net/02_tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 0 additions & 9 deletions ext/net/lib.deno_net.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

/**
Expand Down
21 changes: 0 additions & 21 deletions tests/specs/future/runtime_api/main.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand All @@ -31,6 +12,4 @@ try {
}
}

tlsListener.close();

self.close();
2 changes: 0 additions & 2 deletions tests/specs/future/runtime_api/main.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
window is undefined
Deno.Listener.prototype.rid is undefined
Deno.TlsListener.prototype.rid is undefined
Deno.FsFile constructor is illegal
5 changes: 0 additions & 5 deletions tests/unit/net_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
import {
assert,
assertEquals,
assertNotEquals,
assertRejects,
assertThrows,
delay,
DENO_FUTURE,
execCode,
execCode2,
tmpUnixSocketPath,
Expand All @@ -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();
});

Expand Down