fix: async-mutex not exclusively locking correectly

This commit is contained in:
Jacky Zhao 2023-08-21 16:43:22 -07:00
parent ce70571072
commit b69556c918
3 changed files with 17 additions and 8 deletions

View File

@ -30,7 +30,7 @@ These correspond to following parts of the page:
Quartz **components**, like plugins, can take in additional properties as configuration options. If you're familiar with React terminology, you can think of them as Higher-order Components. Quartz **components**, like plugins, can take in additional properties as configuration options. If you're familiar with React terminology, you can think of them as Higher-order Components.
See [a list of all the components](./tags/component) for all available components along with their configuration options. You can also checkout the guide on [[creating components]] if you're interested in further customizing the behaviour of Quartz. See [a list of all the components](component.md) for all available components along with their configuration options. You can also checkout the guide on [[creating components]] if you're interested in further customizing the behaviour of Quartz.
### Style ### Style

View File

@ -394,8 +394,15 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
const buildMutex = new Mutex() const buildMutex = new Mutex()
const timeoutIds = new Set() const timeoutIds = new Set()
let firstBuild = true
const build = async (clientRefresh) => { const build = async (clientRefresh) => {
await buildMutex.acquire() const release = await buildMutex.acquire()
if (firstBuild) {
firstBuild = false
} else {
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
}
const result = await ctx.rebuild().catch((err) => { const result = await ctx.rebuild().catch((err) => {
console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`) console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
console.log(`Reason: ${chalk.grey(err)}`) console.log(`Reason: ${chalk.grey(err)}`)
@ -418,7 +425,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
const { default: buildQuartz } = await import(cacheFile + `?update=${randomUUID()}`) const { default: buildQuartz } = await import(cacheFile + `?update=${randomUUID()}`)
await buildQuartz(argv, clientRefresh) await buildQuartz(argv, clientRefresh)
clientRefresh() clientRefresh()
buildMutex.release() release()
} }
const rebuild = (clientRefresh) => { const rebuild = (clientRefresh) => {
@ -526,7 +533,6 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
ignoreInitial: true, ignoreInitial: true,
}) })
.on("all", async () => { .on("all", async () => {
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
rebuild(clientRefresh) rebuild(clientRefresh)
}) })
} else { } else {

View File

@ -108,12 +108,13 @@ async function startServing(
toRemove.add(filePath) toRemove.add(filePath)
} }
timeoutIds.forEach((id) => clearTimeout(id))
// debounce rebuilds every 250ms // debounce rebuilds every 250ms
timeoutIds.add( timeoutIds.add(
setTimeout(async () => { setTimeout(async () => {
await buildMutex.acquire() const release = await buildMutex.acquire()
timeoutIds.forEach((id) => clearTimeout(id))
timeoutIds.clear()
const perf = new PerfTimer() const perf = new PerfTimer()
console.log(chalk.yellow("Detected change, rebuilding...")) console.log(chalk.yellow("Detected change, rebuilding..."))
try { try {
@ -134,6 +135,8 @@ async function startServing(
contentMap.delete(fp) contentMap.delete(fp)
} }
// TODO: we can probably traverse the link graph to figure out what's safe to delete here
// instead of just deleting everything
await rimraf(argv.output) await rimraf(argv.output)
const parsedFiles = [...contentMap.values()] const parsedFiles = [...contentMap.values()]
const filteredContent = filterContent(ctx, parsedFiles) const filteredContent = filterContent(ctx, parsedFiles)
@ -146,7 +149,7 @@ async function startServing(
clientRefresh() clientRefresh()
toRebuild.clear() toRebuild.clear()
toRemove.clear() toRemove.clear()
buildMutex.release() release()
}, 250), }, 250),
) )
} }