From 99dbe525d9b221bf12778ed899c94ef103a77c45 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 23 Aug 2023 05:27:41 +0000
Subject: [PATCH] fix: properly lock across source and content refresh by sharing a mutex
---
quartz/build.ts | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/quartz/build.ts b/quartz/build.ts
index 0af39d0..8b1d318 100644
--- a/quartz/build.ts
+++ b/quartz/build.ts
@@ -18,7 +18,7 @@
import { options } from "./util/sourcemap"
import { Mutex } from "async-mutex"
-async function buildQuartz(argv: Argv, clientRefresh: () => void) {
+async function buildQuartz(argv: Argv, mut: Mutex, clientRefresh: () => void) {
const ctx: BuildCtx = {
argv,
cfg,
@@ -38,6 +38,7 @@
console.log(` Emitters: ${pluginNames("emitters").join(", ")}`)
}
+ const release = await mut.acquire()
perf.addEvent("clean")
await rimraf(output)
console.log(`Cleaned output directory \`${output}\` in ${perf.timeSince("clean")}`)
@@ -56,15 +57,17 @@
const filteredContent = filterContent(ctx, parsedFiles)
await emitContent(ctx, filteredContent)
console.log(chalk.green(`Done processing ${fps.length} files in ${perf.timeSince()}`))
+ release()
if (argv.serve) {
- return startServing(ctx, parsedFiles, clientRefresh)
+ return startServing(ctx, mut, parsedFiles, clientRefresh)
}
}
// setup watcher for rebuilds
async function startServing(
ctx: BuildCtx,
+ mut: Mutex,
initialContent: ProcessedContent[],
clientRefresh: () => void,
) {
@@ -78,7 +81,6 @@
}
const initialSlugs = ctx.allSlugs
- const buildMutex = new Mutex()
const timeoutIds: Set<ReturnType<typeof setTimeout>> = new Set()
const toRebuild: Set<FilePath> = new Set()
const toRemove: Set<FilePath> = new Set()
@@ -111,7 +113,7 @@
// debounce rebuilds every 250ms
timeoutIds.add(
setTimeout(async () => {
- const release = await buildMutex.acquire()
+ const release = await mut.acquire()
timeoutIds.forEach((id) => clearTimeout(id))
timeoutIds.clear()
@@ -164,11 +166,16 @@
.on("add", (fp) => rebuild(fp, "add"))
.on("change", (fp) => rebuild(fp, "change"))
.on("unlink", (fp) => rebuild(fp, "delete"))
+
+ return async () => {
+ timeoutIds.forEach((id) => clearTimeout(id))
+ await watcher.close()
+ }
}
-export default async (argv: Argv, clientRefresh: () => void) => {
+export default async (argv: Argv, mut: Mutex, clientRefresh: () => void) => {
try {
- return await buildQuartz(argv, clientRefresh)
+ return await buildQuartz(argv, mut, clientRefresh)
} catch (err) {
trace("\nExiting Quartz due to a fatal error", err as Error)
}
--
Gitblit v1.10.0