From 30dc9bb748f7885a8fd7fe1210e18bf45ee063b8 Mon Sep 17 00:00:00 2001
From: Luca Casonato <lucacasonato@yahoo.com>
Date: Tue, 28 Apr 2020 07:36:47 +0200
Subject: [PATCH] Make shutdown unstable and async (#4940)

---
 cli/js/lib.deno.ns.d.ts | 2 +-
 cli/js/ops/net.ts       | 3 ++-
 cli/ops/net.rs          | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cli/js/lib.deno.ns.d.ts b/cli/js/lib.deno.ns.d.ts
index 6d354d0342..3c568f798a 100644
--- a/cli/js/lib.deno.ns.d.ts
+++ b/cli/js/lib.deno.ns.d.ts
@@ -1872,7 +1872,7 @@ declare namespace Deno {
    *       const conn = await listener.accept();
    *       Deno.shutdown(conn.rid, Deno.ShutdownMode.Write);
    */
-  export function shutdown(rid: number, how: ShutdownMode): void;
+  export function shutdown(rid: number, how: ShutdownMode): Promise<void>;
 
   /** **UNSTABLE**: new API, yet to be vetted.
    *
diff --git a/cli/js/ops/net.ts b/cli/js/ops/net.ts
index 369f2ca3cf..d04c7ba8ff 100644
--- a/cli/js/ops/net.ts
+++ b/cli/js/ops/net.ts
@@ -22,8 +22,9 @@ export enum ShutdownMode {
   ReadWrite, // unused
 }
 
-export function shutdown(rid: number, how: ShutdownMode): void {
+export function shutdown(rid: number, how: ShutdownMode): Promise<void> {
   sendSync("op_shutdown", { rid, how });
+  return Promise.resolve();
 }
 
 interface AcceptResponse {
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index 415d2cecc3..b46eedc682 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -342,10 +342,12 @@ struct ShutdownArgs {
 
 fn op_shutdown(
   isolate: &mut CoreIsolate,
-  _state: &State,
+  state: &State,
   args: Value,
   _zero_copy: Option<ZeroCopyBuf>,
 ) -> Result<JsonOp, OpError> {
+  state.check_unstable("Deno.shutdown");
+
   let args: ShutdownArgs = serde_json::from_value(args)?;
 
   let rid = args.rid as u32;