centralized cleanup handler

src/core/cleanup.ts

@@ -0,0 +1,25 @@
+/*
+* cleanup.ts
+*
+* Copyright (C) 2020 by RStudio, PBC
+*
+*/
+
+import { info } from "log/mod.ts";
+
+const cleanupHandlers: VoidFunction[] = [];
+
+export function onCleanup(handler: VoidFunction) {
+  cleanupHandlers.push(handler);
+}
+
+export function exitWithCleanup(code: number) {
+  for (const handler of cleanupHandlers) {
+    try {
+      handler();
+    } catch (error) {
+      info("Error occurred during cleanup: " + error);
+    }
+  }
+  Deno.exit(code);
+}

src/core/quarto.ts

@@ -7,8 +7,10 @@
 import { existsSync } from "fs/exists.ts";
 import { extname, join } from "path/mod.ts";
 import { info } from "log/mod.ts";
+import * as colors from "fmt/colors.ts";
 
 import { getenv } from "./env.ts";
+import { exitWithCleanup } from "./cleanup.ts";
 
 export const kLocalDevelopment = "99.9.9";
 
@@ -33,7 +35,7 @@ export const quartoConfig = {
   },
 };
 
-export function monitorQuartoSrcChanges(cleanup: VoidFunction) {
+export function monitorQuartoSrcChanges(cleanup?: VoidFunction) {
   if (quartoConfig.isDebug()) {
     const srcDir = Deno.realPathSync(
       join(quartoConfig.binPath(), "../../../src"),
@@ -42,9 +44,16 @@ export function monitorQuartoSrcChanges(cleanup: VoidFunction) {
     const watchForChanges = async () => {
       for await (const event of watcher) {
         if (event.paths.some((path) => extname(path).toLowerCase() === ".ts")) {
-          info("quarto src code changed: preview terminating");
-          cleanup();
-          Deno.exit(1);
+          info(
+            colors.bold(
+              colors.blue("\nquarto src code changed: preview terminating\n"),
+            ),
+          );
+
+          if (cleanup) {
+            cleanup();
+          }
+          exitWithCleanup(1);
         }
       }
     };

src/project/serve/serve.ts

@@ -88,6 +88,7 @@ import { createTempContext, TempContext } from "../../core/temp.ts";
 import { ServeRenderManager } from "./render.ts";
 import { projectScratchPath } from "../project-scratch.ts";
 import { monitorQuartoSrcChanges } from "../../core/quarto.ts";
+import { onCleanup } from "../../core/cleanup.ts";
 
 export const kRenderNone = "none";
 export const kRenderDefault = "default";
@@ -126,7 +127,7 @@ export async function serveProject(
   acquirePreviewLock(project);
 
   // monitor the src dir
-  monitorQuartoSrcChanges(() => releasePreviewLock(project!));
+  monitorQuartoSrcChanges();
 
   // clear the project index
   clearProjectIndex(project.dir);
@@ -558,9 +559,7 @@ function acquirePreviewLock(project: ProjectContext) {
   Deno.writeTextFileSync(lockfile, String(Deno.pid));
 
   // rmeove the lockfile when we exit
-  addEventListener("unload", () => {
-    releasePreviewLock(project);
-  });
+  onCleanup(() => releasePreviewLock(project));
 }
 
 function releasePreviewLock(project: ProjectContext) {

src/quarto.ts

@@ -29,6 +29,7 @@ import {
   readSourceDevConfig,
   reconfigureQuarto,
 } from "./core/devconfig.ts";
+import { exitWithCleanup, onCleanup } from "./core/cleanup.ts";
 
 import { parse } from "flags/mod.ts";
 import { runScript } from "./command/run/run.ts";
@@ -98,6 +99,7 @@ export async function quarto(
 
   // init temp dir
   initSessionTempDir();
+  onCleanup(cleanupSessionTempDir);
 
   await quartoCommand.command("help", new HelpCommand().global())
     .command("completions", new CompletionsCommand()).hidden().parse(args);
@@ -124,7 +126,7 @@ if (import.meta.main) {
     await cleanupLogger();
 
     // exit
-    Deno.exit(0);
+    exitWithCleanup(0);
   } catch (e) {
     if (e) {
       logError(e);
@@ -134,10 +136,5 @@ if (import.meta.main) {
 }
 
 function abend() {
-  cleanup();
-  Deno.exit(1);
-}
-
-function cleanup() {
-  cleanupSessionTempDir();
+  exitWithCleanup(1);
 }