2 files changed, 15 insertions, 1 deletions
diff --git a/ext/net/01_net.js b/ext/net/01_net.js
index a2b04de76..f761aed14 100644
--- a/ext/net/01_net.js
+++ b/ext/net/01_net.js
@@ -40,6 +40,7 @@ const {
   SetPrototypeForEach,
   SymbolAsyncIterator,
   Symbol,
+  SymbolFor,
   TypeError,
   TypedArrayPrototypeSubarray,
   Uint8Array,
@@ -90,6 +91,7 @@ async function resolveDns(query, recordType, options) {
 }
 
 class Conn {
+  [SymbolFor("Deno.internal.rid")] = 0;
   #rid = 0;
   #remoteAddr = null;
   #localAddr = null;
@@ -100,6 +102,7 @@ class Conn {
   #writable;
 
   constructor(rid, remoteAddr, localAddr) {
+    this[SymbolFor("Deno.internal.rid")] = rid;
     this.#rid = rid;
     this.#remoteAddr = remoteAddr;
     this.#localAddr = localAddr;
@@ -198,10 +201,12 @@ class Conn {
 }
 
 class TcpConn extends Conn {
+  [SymbolFor("Deno.internal.rid")] = 0;
   #rid = 0;
 
   constructor(rid, remoteAddr, localAddr) {
     super(rid, remoteAddr, localAddr);
+    this[SymbolFor("Deno.internal.rid")] = rid;
     this.#rid = rid;
   }
 
@@ -224,10 +229,12 @@ class TcpConn extends Conn {
 }
 
 class UnixConn extends Conn {
+  [SymbolFor("Deno.internal.rid")] = 0;
   #rid = 0;
 
   constructor(rid, remoteAddr, localAddr) {
     super(rid, remoteAddr, localAddr);
+    this[SymbolFor("Deno.internal.rid")] = rid;
     this.#rid = rid;
   }
 
@@ -242,12 +249,14 @@ class UnixConn extends Conn {
 }
 
 class Listener {
+  [SymbolFor("Deno.internal.rid")] = 0;
   #rid = 0;
   #addr = null;
   #unref = false;
   #promise = null;
 
   constructor(rid, addr) {
+    this[SymbolFor("Deno.internal.rid")] = rid;
     this.#rid = rid;
     this.#addr = addr;
   }
diff --git a/ext/net/02_tls.js b/ext/net/02_tls.js
index 5405d68a3..021ad9371 100644
--- a/ext/net/02_tls.js
+++ b/ext/net/02_tls.js
@@ -10,6 +10,7 @@ const {
 } = core.ensureFastOps();
 const {
   Number,
+  SymbolFor,
   TypeError,
 } = primordials;
 
@@ -24,10 +25,12 @@ function opTlsHandshake(rid) {
 }
 
 class TlsConn extends Conn {
+  [SymbolFor("Deno.internal.rid")] = 0;
   #rid = 0;
 
   constructor(rid, remoteAddr, localAddr) {
     super(rid, remoteAddr, localAddr);
+    this[SymbolFor("Deno.internal.rid")] = rid;
     this.#rid = rid;
   }
 
@@ -75,10 +78,12 @@ async function connectTls({
 }
 
 class TlsListener extends Listener {
+  [SymbolFor("Deno.internal.rid")] = 0;
   #rid = 0;
 
   constructor(rid, addr) {
     super(rid, addr);
+    this[SymbolFor("Deno.internal.rid")] = rid;
     this.#rid = rid;
   }
 
@@ -146,7 +151,7 @@ async function startTls(
   } = {},
 ) {
   const { 0: rid, 1: localAddr, 2: remoteAddr } = await opStartTls({
-    rid: conn.rid,
+    rid: conn[SymbolFor("Deno.internal.rid")],
     hostname,
     certFile,
     caCerts,