chore - deno 2

Author: cscheid

configuration

@@ -11,7 +11,7 @@
 # in src/command/check/check.ts
 
 # Binary dependencies
-export DENO=v1.46.3
+export DENO=v2.2.10
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.41-alpha-artifacts
 export PANDOC=3.6.3

package/scripts/deno_std/download.sh

@@ -10,4 +10,4 @@ fi
 
 
 export DENO_DIR="$QUARTO_SRC_PATH/resources/deno_std/cache"
-"$QUARTO_DENO" cache --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"
+"$QUARTO_DENO" cache --allow-all --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"

src/command/preview/preview-shiny.ts

@@ -159,13 +159,6 @@ function runPreviewControlService(
 
   const port = findOpenPort();
 
-  const controlListener = Deno.listen({ port, hostname: kLocalhost });
-  onCleanup(() => controlListener.close());
-
-  handleHttpRequests(controlListener, handler).then(() => {
-    // terminanted
-  }).catch((_error) => {
-    // ignore errors
-  });
+  onCleanup(handleHttpRequests({ ...handlerOptions, handler }).stop);
   info(`Preview service running (${port})`);
 }

src/core/http-server.ts

@@ -1,30 +1,22 @@
 /*
  * http-server.ts
  *
- * Copyright (C) 2020-2022 Posit Software, PBC
+ * Copyright (C) 2025 Posit Software, PBC
  */
 
-import { warning } from "../deno_ral/log.ts";
-
-export async function handleHttpRequests(
-  listener: Deno.Listener,
-  handler: (req: Request) => Promise<Response>,
+export function handleHttpRequests(
+  options: {
+    port?: number;
+    hostname?: string;
+    handler: (req: Request) => Promise<Response>;
+  },
 ) {
-  for await (const conn of listener) {
-    (async () => {
-      try {
-        for await (const { request, respondWith } of Deno.serveHttp(conn)) {
-          await respondWith(handler(request));
-        }
-      } catch (err) {
-        if (!(err instanceof Error)) throw err;
-        warning(err.message);
-        try {
-          conn.close();
-        } catch {
-          //
-        }
-      }
-    })();
-  }
+  const abortController = new AbortController();
+  const server = Deno.serve({ ...options, signal: abortController.signal });
+  return {
+    server,
+    stop: () => {
+      abortController.abort();
+    },
+  };
 }

src/core/http.ts

@@ -150,6 +150,7 @@ export function httpFileRequestHandler(
         }
       }
     } catch (e) {
+      if (!(e instanceof Error)) throw e;
       // it's possible for an exception to occur before we've normalized the path
       // so we need to renormalize it here
       if (fsPath) {

src/preview/preview-server.ts

@@ -5,7 +5,6 @@
  */
 
 import { MuxAsyncIterator } from "async/mux-async-iterator";
-import { iterateReader } from "io/iterate-reader";
 import { isWindows } from "../deno_ral/platform.ts";
 
 export interface PreviewServer {

src/project/serve/serve.ts

@@ -403,7 +403,7 @@ function externalPreviewServer(
 ): Promise<PreviewServer> {
   // run a control channel server for handling render requests
   // if there was a renderToken() passed
-  let controlListener: Deno.Listener | undefined;
+  let stop: () => void | undefined;
   if (renderToken()) {
     const outputDir = projectOutputDir(project);
     const handlerOptions: HttpFileRequestOptions = {
@@ -425,12 +425,12 @@ function externalPreviewServer(
 
     const handler = httpFileRequestHandler(handlerOptions);
     const port = findOpenPort();
-    controlListener = Deno.listen({ port, hostname: kLocalhost });
-    handleHttpRequests(controlListener, handler).then(() => {
-      // terminanted
-    }).catch((_error) => {
-      // ignore errors
-    });
+    ({ stop } = handleHttpRequests({
+      port,
+      hostname: kLocalhost,
+      handler,
+    }));
+    // .abortController;
     info(`Preview service running (${port})`);
   }
 
@@ -467,9 +467,7 @@ function externalPreviewServer(
       return server.serve();
     },
     stop: () => {
-      if (controlListener) {
-        controlListener.close();
-      }
+      stop?.();
       return server.stop();
     },
   });
@@ -772,15 +770,21 @@ async function internalPreviewServer(
   const path = (targetPath && targetPath !== "index.html") ? targetPath : "";
 
   // start listening
-  const listener = Deno.listen({ port: options.port!, hostname: options.host });
+  let stop: () => void | undefined;
 
   return {
     start: () => Promise.resolve(path),
     serve: async () => {
-      await handleHttpRequests(listener, handler);
+      const { server, stop: stopServer } = handleHttpRequests({
+        port: options.port!,
+        hostname: options.host,
+        handler,
+      });
+      stop = stopServer;
+      await server.finished;
     },
     stop: () => {
-      listener.close();
+      stop?.();
       return Promise.resolve();
     },
   };