From da23f7f8763cab90fbbf37d9c7cddf3758d7d364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 20 Jan 2023 16:32:55 +0100 Subject: [PATCH] feat: Stabilize Deno.Listener.ref/unref (#17477) --- cli/tsc/dts/lib.deno.unstable.d.ts | 17 ----------------- ext/net/01_net.js | 8 -------- ext/net/lib.deno_net.d.ts | 11 +++++++++++ runtime/js/99_main.js | 3 --- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/cli/tsc/dts/lib.deno.unstable.d.ts b/cli/tsc/dts/lib.deno.unstable.d.ts index e3ae8f46f7..7ca089108d 100644 --- a/cli/tsc/dts/lib.deno.unstable.d.ts +++ b/cli/tsc/dts/lib.deno.unstable.d.ts @@ -1082,23 +1082,6 @@ declare namespace Deno { alpnProtocols?: string[]; } - /** @category Network */ - export interface Listener extends AsyncIterable { - /** **UNSTABLE**: New API, yet to be vetted. - * - * Make the listener block the event loop from finishing. - * - * Note: the listener blocks the event loop from finishing by default. - * This method is only meaningful after `.unref()` is called. - */ - ref(): void; - /** **UNSTABLE**: New API, yet to be vetted. - * - * Make the listener not block the event loop from finishing. - */ - unref(): void; - } - /** **UNSTABLE**: New API, yet to be vetted. * * Acquire an advisory file-system lock for the provided file. diff --git a/ext/net/01_net.js b/ext/net/01_net.js index c15ff56aff..a6043786f5 100644 --- a/ext/net/01_net.js +++ b/ext/net/01_net.js @@ -408,15 +408,7 @@ } } - function setup(unstable) { - if (!unstable) { - delete Listener.prototype.ref; - delete Listener.prototype.unref; - } - } - window.__bootstrap.net = { - setup, connect, Conn, TcpConn, diff --git a/ext/net/lib.deno_net.d.ts b/ext/net/lib.deno_net.d.ts index 6a3da03c3c..ce0efdad25 100644 --- a/ext/net/lib.deno_net.d.ts +++ b/ext/net/lib.deno_net.d.ts @@ -37,6 +37,17 @@ declare namespace Deno { readonly rid: number; [Symbol.asyncIterator](): AsyncIterableIterator; + + /** + * Make the listener block the event loop from finishing. + * + * Note: the listener blocks the event loop from finishing by default. + * This method is only meaningful after `.unref()` is called. + */ + ref(): void; + + /** Make the listener not block the event loop from finishing. */ + unref(): void; } /** Specialized listener that accepts TLS connections. diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index 4fd6644dba..ea519cb358 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -52,7 +52,6 @@ delete Intl.v8BreakIterator; const quoteString = window.__bootstrap.console.quoteString; const internals = window.__bootstrap.internals; const performance = window.__bootstrap.performance; - const net = window.__bootstrap.net; const url = window.__bootstrap.url; const fetch = window.__bootstrap.fetch; const messagePort = window.__bootstrap.messagePort; @@ -397,7 +396,6 @@ delete Intl.v8BreakIterator; core.initializeAsyncOps(); performance.setTimeOrigin(DateNow()); - net.setup(runtimeOptions.unstableFlag); const consoleFromV8 = window.Deno.core.console; const wrapConsole = window.__bootstrap.console.wrapConsole; @@ -542,7 +540,6 @@ delete Intl.v8BreakIterator; core.initializeAsyncOps(); performance.setTimeOrigin(DateNow()); - net.setup(runtimeOptions.unstableFlag); const consoleFromV8 = window.Deno.core.console; const wrapConsole = window.__bootstrap.console.wrapConsole;