From ae2e3b463a91d94caa8bdf62e5c3a3d726b8b4e4 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 23 Jul 2023 18:49:26 +0000
Subject: [PATCH] improve error handling while serving
---
quartz/processors/parse.ts | 112 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/quartz/processors/parse.ts b/quartz/processors/parse.ts
index 170e964..55783dc 100644
--- a/quartz/processors/parse.ts
+++ b/quartz/processors/parse.ts
@@ -1,19 +1,19 @@
-import esbuild from 'esbuild'
-import remarkParse from 'remark-parse'
-import remarkRehype from 'remark-rehype'
+import esbuild from "esbuild"
+import remarkParse from "remark-parse"
+import remarkRehype from "remark-rehype"
import { Processor, unified } from "unified"
-import { Root as MDRoot } from 'remark-parse/lib'
-import { Root as HTMLRoot } from 'hast'
-import { ProcessedContent } from '../plugins/vfile'
-import { PerfTimer } from '../perf'
-import { read } from 'to-vfile'
-import { slugify } from '../path'
-import path from 'path'
-import os from 'os'
-import workerpool, { Promise as WorkerPromise } from 'workerpool'
-import { QuartzTransformerPluginInstance } from '../plugins/types'
-import { QuartzLogger } from '../log'
-import chalk from 'chalk'
+import { Root as MDRoot } from "remark-parse/lib"
+import { Root as HTMLRoot } from "hast"
+import { ProcessedContent } from "../plugins/vfile"
+import { PerfTimer } from "../perf"
+import { read } from "to-vfile"
+import { FilePath, QUARTZ, ServerSlug, slugifyFilePath } from "../path"
+import path from "path"
+import os from "os"
+import workerpool, { Promise as WorkerPromise } from "workerpool"
+import { QuartzTransformerPluginInstance } from "../plugins/types"
+import { QuartzLogger } from "../log"
+import { trace } from "../trace"
export type QuartzProcessor = Processor<MDRoot, HTMLRoot, void>
export function createProcessor(transformers: QuartzTransformerPluginInstance[]): QuartzProcessor {
@@ -21,16 +21,15 @@
let processor = unified().use(remarkParse)
// MD AST -> MD AST transforms
- for (const plugin of transformers.filter(p => p.markdownPlugins)) {
+ for (const plugin of transformers.filter((p) => p.markdownPlugins)) {
processor = processor.use(plugin.markdownPlugins!())
}
// MD AST -> HTML AST
processor = processor.use(remarkRehype, { allowDangerousHtml: true })
-
// HTML AST -> HTML AST transforms
- for (const plugin of transformers.filter(p => p.htmlPlugins)) {
+ for (const plugin of transformers.filter((p) => p.htmlPlugins)) {
processor = processor.use(plugin.htmlPlugins!())
}
@@ -49,7 +48,7 @@
const fp = "./quartz/worker.ts"
return esbuild.build({
entryPoints: [fp],
- outfile: path.join("quartz", cacheFile),
+ outfile: path.join(QUARTZ, cacheFile),
bundle: true,
keepNames: true,
platform: "node",
@@ -57,23 +56,29 @@
packages: "external",
plugins: [
{
- name: 'css-and-scripts-as-text',
+ name: "css-and-scripts-as-text",
setup(build) {
build.onLoad({ filter: /\.scss$/ }, (_) => ({
- contents: '',
- loader: 'text'
+ contents: "",
+ loader: "text",
}))
build.onLoad({ filter: /\.inline\.(ts|js)$/ }, (_) => ({
- contents: '',
- loader: 'text'
+ contents: "",
+ loader: "text",
}))
- }
- }
- ]
+ },
+ },
+ ],
})
}
-export function createFileParser(transformers: QuartzTransformerPluginInstance[], baseDir: string, fps: string[], verbose: boolean) {
+export function createFileParser(
+ transformers: QuartzTransformerPluginInstance[],
+ baseDir: string,
+ fps: FilePath[],
+ allSlugs: ServerSlug[],
+ verbose: boolean,
+) {
return async (processor: QuartzProcessor) => {
const res: ProcessedContent[] = []
for (const fp of fps) {
@@ -84,12 +89,13 @@
file.value = file.value.toString().trim()
// Text -> Text transforms
- for (const plugin of transformers.filter(p => p.textTransform)) {
+ for (const plugin of transformers.filter((p) => p.textTransform)) {
file.value = plugin.textTransform!(file.value)
}
// base data properties that plugins may use
- file.data.slug = slugify(path.relative(baseDir, file.path))
+ file.data.slug = slugifyFilePath(path.relative(baseDir, file.path) as FilePath)
+ file.data.allSlugs = allSlugs
file.data.filePath = fp
const ast = processor.parse(file)
@@ -100,8 +106,8 @@
console.log(`[process] ${fp} -> ${file.data.slug}`)
}
} catch (err) {
- console.log(chalk.red(`\nFailed to process \`${fp}\`: `) + err)
- process.exit(1)
+ trace(`\nFailed to process \`${fp}\``, err as Error)
+ throw err
}
}
@@ -109,33 +115,45 @@
}
}
-export async function parseMarkdown(transformers: QuartzTransformerPluginInstance[], baseDir: string, fps: string[], verbose: boolean): Promise<ProcessedContent[]> {
+export async function parseMarkdown(
+ transformers: QuartzTransformerPluginInstance[],
+ baseDir: string,
+ fps: FilePath[],
+ verbose: boolean,
+): Promise<ProcessedContent[]> {
const perf = new PerfTimer()
const log = new QuartzLogger(verbose)
const CHUNK_SIZE = 128
let concurrency = fps.length < CHUNK_SIZE ? 1 : os.availableParallelism()
- let res: ProcessedContent[] = []
+ // get all slugs ahead of time as each thread needs a copy
+ const allSlugs = fps.map((fp) =>
+ slugifyFilePath(path.relative(baseDir, path.resolve(fp)) as FilePath),
+ )
+
+ let res: ProcessedContent[] = []
log.start(`Parsing input files using ${concurrency} threads`)
if (concurrency === 1) {
- const processor = createProcessor(transformers)
- const parse = createFileParser(transformers, baseDir, fps, verbose)
- res = await parse(processor)
+ try {
+ const processor = createProcessor(transformers)
+ const parse = createFileParser(transformers, baseDir, fps, allSlugs, verbose)
+ res = await parse(processor)
+ } catch (error) {
+ log.end()
+ throw error
+ }
} else {
await transpileWorkerScript()
- const pool = workerpool.pool(
- './quartz/bootstrap-worker.mjs',
- {
- minWorkers: 'max',
- maxWorkers: concurrency,
- workerType: 'thread'
- }
- )
+ const pool = workerpool.pool("./quartz/bootstrap-worker.mjs", {
+ minWorkers: "max",
+ maxWorkers: concurrency,
+ workerType: "thread",
+ })
const childPromises: WorkerPromise<ProcessedContent[]>[] = []
for (const chunk of chunks(fps, CHUNK_SIZE)) {
- childPromises.push(pool.exec('parseFiles', [baseDir, chunk, verbose]))
+ childPromises.push(pool.exec("parseFiles", [baseDir, chunk, allSlugs, verbose]))
}
const results: ProcessedContent[][] = await WorkerPromise.all(childPromises)
@@ -143,6 +161,6 @@
await pool.terminate()
}
- log.success(`Parsed ${res.length} Markdown files in ${perf.timeSince()}`)
+ log.end(`Parsed ${res.length} Markdown files in ${perf.timeSince()}`)
return res
}
--
Gitblit v1.10.0