From ca17af4ae20b9310da52a3752b8d7744c932f3e2 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 20 Aug 2023 22:02:24 +0000
Subject: [PATCH] fix: dont show index page for folder in its own listing

---
 quartz/bootstrap-cli.mjs |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index ee62a56..f7f5504 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -16,10 +16,11 @@
 import serveHandler from "serve-handler"
 import { WebSocketServer } from "ws"
 import { randomUUID } from "crypto"
+import { Mutex } from "async-mutex"
 
 const ORIGIN_NAME = "origin"
 const UPSTREAM_NAME = "upstream"
-const QUARTZ_SOURCE_BRANCH = "v4-alpha"
+const QUARTZ_SOURCE_BRANCH = "v4"
 const cwd = process.cwd()
 const cacheDir = path.join(cwd, ".quartz-cache")
 const cacheFile = "./.quartz-cache/transpiled-build.mjs"
@@ -76,6 +77,7 @@
   },
   baseDir: {
     string: true,
+    default: "",
     describe: "base path to serve your local server on",
   },
   port: {
@@ -135,7 +137,10 @@
 
 function gitPull(origin, branch) {
   const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"]
-  spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
+  const out = spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
+  if (out.stderr) {
+    throw new Error(`Error while pulling updates: ${out.stderr}`)
+  }
 }
 
 yargs(hideBin(process.argv))
@@ -257,13 +262,13 @@
     const contentFolder = path.join(cwd, argv.directory)
     console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
     console.log("Backing up your content")
+    execSync(
+      `git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
+    )
     await stashContentFolder(contentFolder)
     console.log(
       "Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
     )
-    execSync(
-      `git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
-    )
     gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
     await popContentFolder(contentFolder)
     console.log("Ensuring dependencies are up to date")
@@ -387,8 +392,10 @@
       ],
     })
 
+    const buildMutex = new Mutex()
     const timeoutIds = new Set()
     const build = async (clientRefresh) => {
+      await buildMutex.acquire()
       const result = await ctx.rebuild().catch((err) => {
         console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
         console.log(`Reason: ${chalk.grey(err)}`)
@@ -411,6 +418,7 @@
       const { default: buildQuartz } = await import(cacheFile + `?update=${randomUUID()}`)
       await buildQuartz(argv, clientRefresh)
       clientRefresh()
+      buildMutex.release()
     }
 
     const rebuild = (clientRefresh) => {
@@ -424,8 +432,26 @@
       wss.on("connection", (ws) => connections.push(ws))
       const clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))
 
+      if (argv.baseDir !== "" && !argv.baseDir.startsWith("/")) {
+        argv.baseDir = "/" + argv.baseDir
+      }
+
       await build(clientRefresh)
       const server = http.createServer(async (req, res) => {
+        if (argv.baseDir && !req.url?.startsWith(argv.baseDir)) {
+          console.log(
+            chalk.red(
+              `[404] ${req.url} (warning: link outside of site, this is likely a Quartz bug)`,
+            ),
+          )
+          res.writeHead(404)
+          res.end()
+          return
+        }
+
+        // strip baseDir prefix
+        req.url = req.url?.slice(argv.baseDir.length)
+
         const serve = async () => {
           await serveHandler(req, res, {
             public: argv.output,
@@ -434,14 +460,15 @@
           const status = res.statusCode
           const statusString =
             status >= 200 && status < 300 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
-          console.log(statusString + chalk.grey(` ${req.url}`))
+          console.log(statusString + chalk.grey(` ${argv.baseDir}${req.url}`))
         }
 
         const redirect = (newFp) => {
+          newFp = argv.baseDir + newFp
           res.writeHead(302, {
             Location: newFp,
           })
-          console.log(chalk.yellow("[302]") + chalk.grey(` ${req.url} -> ${newFp}`))
+          console.log(chalk.yellow("[302]") + chalk.grey(` ${argv.baseDir}${req.url} -> ${newFp}`))
           res.end()
         }
 
@@ -487,7 +514,11 @@
         return serve()
       })
       server.listen(argv.port)
-      console.log(chalk.cyan(`Started a Quartz server listening at http://localhost:${argv.port}`))
+      console.log(
+        chalk.cyan(
+          `Started a Quartz server listening at http://localhost:${argv.port}${argv.baseDir}`,
+        ),
+      )
       console.log("hint: exit with ctrl+c")
       chokidar
         .watch(["**/*.ts", "**/*.tsx", "**/*.scss", "package.json"], {

--
Gitblit v1.10.0