fix: race condition in concurrent slidev export (#2461)

moreal · kermanx · web-flow · commit 807caae3a019 · 2026-02-24T18:33:28.000+08:00
Co-authored-by: _Kerman &lt;kermanx@qq.com&gt;
diff --git a/packages/slidev/node/cli.ts b/packages/slidev/node/cli.ts
@@ -456,7 +456,7 @@ cli.command(
   async (args) => {
     const { entry, theme } = args
     const { exportSlides, getExportOptions } = await import('./commands/export')
-    const port = await getPort(12445)
+    const candidatePort = await getPort(12445)
 
     let warned = false
     for (const entryFile of entry as unknown as string) {
@@ -471,21 +471,27 @@ cli.command(
         )
       }
 
-      const server = await createServer(
-        options,
-        {
-          server: { port },
-          clearScreen: false,
-        },
-      )
-      await server.listen(port)
-      printInfo(options)
-      const result = await exportSlides({
-        port,
-        ...getExportOptions({ ...args, entry: entryFile }, options),
-      })
-      console.log(`${green('  ✓ ')}${dim('exported to ')}${result}\n`)
-      server.close()
+      let server: ViteDevServer | undefined
+      try {
+        server = await createServer(
+          options,
+          {
+            server: { port: candidatePort },
+            clearScreen: false,
+          },
+        )
+        await server.listen(candidatePort)
+        const port = getViteServerPort(server)
+        printInfo(options)
+        const result = await exportSlides({
+          port,
+          ...getExportOptions({ ...args, entry: entryFile }, options),
+        })
+        console.log(`${green('  ✓ ')}${dim('exported to ')}${result}\n`)
+      }
+      finally {
+        await server?.close()
+      }
     }
 
     process.exit(0)
@@ -524,30 +530,35 @@ cli.command(
     wait,
   }) => {
     const { exportNotes } = await import('./commands/export')
-    const port = await getPort(12445)
+    const candidatePort = await getPort(12445)
 
     for (const entryFile of entry as unknown as string[]) {
       const options = await resolveOptions({ entry: entryFile }, 'export')
-      const server = await createServer(
-        options,
-        {
-          server: { port },
-          clearScreen: false,
-        },
-      )
-      await server.listen(port)
-
-      printInfo(options)
-
-      const result = await exportNotes({
-        port,
-        output: output || (options.data.config.exportFilename ? `${options.data.config.exportFilename}-notes` : `${path.basename(entryFile, '.md')}-export-notes`),
-        timeout,
-        wait,
-      })
-      console.log(`${green('  ✓ ')}${dim('exported to ')}${result}\n`)
-
-      server.close()
+      let server: ViteDevServer | undefined
+      try {
+        server = await createServer(
+          options,
+          {
+            server: { port: candidatePort },
+            clearScreen: false,
+          },
+        )
+        await server.listen(candidatePort)
+        const port = getViteServerPort(server)
+
+        printInfo(options)
+
+        const result = await exportNotes({
+          port,
+          output: output || (options.data.config.exportFilename ? `${options.data.config.exportFilename}-notes` : `${path.basename(entryFile, '.md')}-export-notes`),
+          timeout,
+          wait,
+        })
+        console.log(`${green('  ✓ ')}${dim('exported to ')}${result}\n`)
+      }
+      finally {
+        await server?.close()
+      }
     }
 
     process.exit(0)
@@ -558,6 +569,13 @@ cli
   .help()
   .parse()
 
+function getViteServerPort(server: ViteDevServer): number {
+  const address = server.httpServer?.address()
+  if (address && typeof address === 'object')
+    return address.port
+  throw new Error('Failed to get Vite server port')
+}
+
 function commonOptions(args: Argv<object>) {
   return args
     .positional('entry', {
