BREAKING(net): remove `Deno.{Conn,TlsConn,TcpConn,UnixConn}.prototype…

….rid` (#25446) Towards #22079 --------- Signed-off-by: Asher Gomez <[email protected]>
denoland · Sep 6, 2024 · a9ed06b · a9ed06b
1 parent 5bac407
commit a9ed06b
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 122 deletions.
diff --git a/ext/net/01_net.js b/ext/net/01_net.js
@@ -101,13 +101,6 @@ class Conn {
   #writable;
 
   constructor(rid, remoteAddr, localAddr) {
-    if (internals.future) {
-      ObjectDefineProperty(this, "rid", {
-        __proto__: null,
-        enumerable: false,
-        value: undefined,
-      });
-    }
     ObjectDefineProperty(this, internalRidSymbol, {
       __proto__: null,
       enumerable: false,
@@ -118,15 +111,6 @@ class Conn {
     this.#localAddr = localAddr;
   }
 
-  get rid() {
-    internals.warnOnDeprecatedApi(
-      "Deno.Conn.rid",
-      new Error().stack,
-      "Use `Deno.Conn` instance methods instead.",
-    );
-    return this.#rid;
-  }
-
   get remoteAddr() {
     return this.#remoteAddr;
   }
@@ -223,15 +207,6 @@ class TcpConn extends Conn {
     this.#rid = rid;
   }
 
-  get rid() {
-    internals.warnOnDeprecatedApi(
-      "Deno.TcpConn.rid",
-      new Error().stack,
-      "Use `Deno.TcpConn` instance methods instead.",
-    );
-    return this.#rid;
-  }
-
   setNoDelay(noDelay = true) {
     return op_set_nodelay(this.#rid, noDelay);
   }
@@ -253,15 +228,6 @@ class UnixConn extends Conn {
     });
     this.#rid = rid;
   }
-
-  get rid() {
-    internals.warnOnDeprecatedApi(
-      "Deno.UnixConn.rid",
-      new Error().stack,
-      "Use `Deno.UnixConn` instance methods instead.",
-    );
-    return this.#rid;
-  }
 }
 
 class Listener {

diff --git a/ext/net/02_tls.js b/ext/net/02_tls.js
@@ -37,15 +37,6 @@ class TlsConn extends Conn {
     this.#rid = rid;
   }
 
-  get rid() {
-    internals.warnOnDeprecatedApi(
-      "Deno.TlsConn.rid",
-      new Error().stack,
-      "Use `Deno.TlsConn` instance methods instead.",
-    );
-    return this.#rid;
-  }
-
   handshake() {
     return op_tls_handshake(this.#rid);
   }

diff --git a/ext/net/lib.deno_net.d.ts b/ext/net/lib.deno_net.d.ts
@@ -83,14 +83,6 @@ declare namespace Deno {
     readonly localAddr: A;
     /** The remote address of the connection. */
     readonly remoteAddr: A;
-    /**
-     * The resource ID of the connection.
-     *
-     * @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;
     /** Shuts down (`shutdown(2)`) the write side of the connection. Most
      * callers should just use `close()`. */
     closeWrite(): Promise<void>;
@@ -123,14 +115,6 @@ declare namespace Deno {
      * not happened yet. Calling this method is optional; the TLS handshake
      * will be completed automatically as soon as data is sent or received. */
     handshake(): Promise<TlsHandshakeInfo>;
-    /**
-     * The resource ID of the connection.
-     *
-     * @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;
   }
 
   /** @category Network */
@@ -359,14 +343,6 @@ declare namespace Deno {
     setNoDelay(noDelay?: boolean): void;
     /** Enable/disable keep-alive functionality. */
     setKeepAlive(keepAlive?: boolean): void;
-    /**
-     * The resource ID of the connection.
-     *
-     * @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;
   }
 
   /** @category Network */
@@ -376,16 +352,7 @@ declare namespace Deno {
   }
 
   /** @category Network */
-  export interface UnixConn extends Conn<UnixAddr> {
-    /**
-     * The resource ID of the connection.
-     *
-     * @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;
-  }
+  export interface UnixConn extends Conn<UnixAddr> {}
 
   /** Connects to the hostname (default is "127.0.0.1") and port on the named
    * transport (default is "tcp"), and resolves to the connection (`Conn`).

diff --git a/tests/specs/future/runtime_api/main.js b/tests/specs/future/runtime_api/main.js
@@ -9,28 +9,8 @@ console.log(
 const tcpPort = 4509;
 const tcpListener = Deno.listen({ port: tcpPort });
 console.log("Deno.Listener.prototype.rid is", tcpListener.rid);
-
-const tcpConn = await Deno.connect({ port: tcpPort });
-console.log("Deno.Conn.prototype.rid is", tcpConn.rid);
-
-tcpConn.close();
 tcpListener.close();
 
-// Unix
-if (Deno.build.os === "windows") {
-  console.log("Deno.UnixConn.prototype.rid is undefined");
-} else {
-  const socketPath = "./test.sock";
-  const unixListener = Deno.listen({ transport: "unix", path: socketPath });
-
-  const unixConn = await Deno.connect({ transport: "unix", path: socketPath });
-  console.log("Deno.UnixConn.prototype.rid is", unixConn.rid);
-
-  unixConn.close();
-  unixListener.close();
-  Deno.removeSync(socketPath);
-}
-
 // TLS
 // Since these tests may run in parallel, ensure this port is unique to this file
 const tlsPort = 4510;
@@ -43,11 +23,6 @@ const key = Deno.readTextFileSync(
 const tlsListener = Deno.listenTls({ port: tlsPort, cert, key });
 console.log("Deno.TlsListener.prototype.rid is", tlsListener.rid);
 
-const tlsConn = await Deno.connectTls({ port: tlsPort });
-console.log("Deno.TlsConn.prototype.rid is", tlsConn.rid);
-
-tlsConn.close();
-
 try {
   new Deno.FsFile(0);
 } catch (error) {

diff --git a/tests/specs/future/runtime_api/main.out b/tests/specs/future/runtime_api/main.out
@@ -1,10 +1,7 @@
 window is undefined
 Deno.FsFile.prototype.rid is undefined
 Deno.Listener.prototype.rid is undefined
-Deno.Conn.prototype.rid is undefined
-Deno.UnixConn.prototype.rid is undefined
 Deno.TlsListener.prototype.rid is undefined
-Deno.TlsConn.prototype.rid is undefined
 Deno.FsFile constructor is illegal
 Deno.ConnectTlsOptions.(certFile|keyFile) do nothing
 Deno.ConnectTlsOptions.(certChain|privateKey) do nothing

diff --git a/tests/unit/net_test.ts b/tests/unit/net_test.ts
@@ -236,9 +236,6 @@ Deno.test({ permissions: { net: true } }, async function netTcpDialListen() {
   assertEquals(1, buf[0]);
   assertEquals(2, buf[1]);
   assertEquals(3, buf[2]);
-  if (!DENO_FUTURE) {
-    assert(conn.rid > 0);
-  }
 
   assert(readResult !== null);
 
@@ -274,9 +271,6 @@ Deno.test({ permissions: { net: true } }, async function netTcpSetNoDelay() {
   assertEquals(1, buf[0]);
   assertEquals(2, buf[1]);
   assertEquals(3, buf[2]);
-  if (!DENO_FUTURE) {
-    assert(conn.rid > 0);
-  }
 
   assert(readResult !== null);
 
@@ -312,9 +306,6 @@ Deno.test({ permissions: { net: true } }, async function netTcpSetKeepAlive() {
   assertEquals(1, buf[0]);
   assertEquals(2, buf[1]);
   assertEquals(3, buf[2]);
-  if (!DENO_FUTURE) {
-    assert(conn.rid > 0);
-  }
 
   assert(readResult !== null);
 
@@ -352,9 +343,6 @@ Deno.test(
     assertEquals(1, buf[0]);
     assertEquals(2, buf[1]);
     assertEquals(3, buf[2]);
-    if (!DENO_FUTURE) {
-      assert(conn.rid > 0);
-    }
 
     assert(readResult !== null);
 
@@ -850,9 +838,6 @@ Deno.test(
     assertEquals(1, buf[0]);
     assertEquals(2, buf[1]);
     assertEquals(3, buf[2]);
-    if (!DENO_FUTURE) {
-      assert(conn.rid > 0);
-    }
 
     assert(readResult !== null);
 

diff --git a/tests/unit/tls_test.ts b/tests/unit/tls_test.ts
@@ -221,7 +221,6 @@ Deno.test(
     );
 
     const conn = await Deno.connectTls({ hostname, port, caCerts });
-    assert(DENO_FUTURE || conn.rid > 0);
     const w = new BufWriter(conn);
     const r = new BufReader(conn);
     const body = `GET / HTTP/1.1\r\nHost: ${hostname}:${port}\r\n\r\n`;
@@ -273,7 +272,6 @@ Deno.test(
     );
 
     const conn = await Deno.connectTls({ hostname, port, caCerts });
-    assert(DENO_FUTURE || conn.rid > 0);
     const w = new BufWriter(conn);
     const r = new BufReader(conn);
     const body = `GET / HTTP/1.1\r\nHost: ${hostname}:${port}\r\n\r\n`;