fix: apply fixes required for Vite plugin in Astro (#332)

* fix: Use same directory for tmpdir to prevent cross-volume issues

* fix: create and destroy netlify dev server bundle in the same place

gets rid of the plugin-level netlifyDev let, and we no longer need to check
if the middleware doesn't exist

* Remove leading 0. from random file name

Co-authored-by: Eduardo Bouças <[email protected]>

* make tmp string more aestheic

---------

Co-authored-by: Eduardo Bouças <[email protected]>

Author: chee

packages/blobs/src/server.ts

@@ -1,6 +1,5 @@
 import { createHmac } from 'node:crypto'
 import { createReadStream, promises as fs } from 'node:fs'
-import { tmpdir } from 'node:os'
 import { dirname, join, relative, resolve, sep } from 'node:path'
 
 import { HTTPServer } from '@netlify/dev-utils'
@@ -318,10 +317,10 @@ export class BlobsServer {
       // happen if multiple clients try to write to the same key at the same
       // time. To prevent this, we write to a temporary file first and then
       // atomically move it to its final destination.
-      const tempPath = join(tmpdir(), Math.random().toString())
+      const tempPath = join(dirname(dataPath), `.${Math.random().toString(36).slice(2)}`)
       const body = await req.arrayBuffer()
-      await fs.writeFile(tempPath, Buffer.from(body))
       await fs.mkdir(dirname(dataPath), { recursive: true })
+      await fs.writeFile(tempPath, Buffer.from(body))
       await fs.rename(tempPath, dataPath)
 
       if (metadata) {

packages/vite-plugin/src/main.ts

@@ -22,15 +22,18 @@ export default function netlify(options: NetlifyPluginOptions = {}): any {
     return []
   }
 
-  let netlifyDev: NetlifyDev | undefined
-
   const plugin: vite.Plugin = {
     name: 'vite-plugin-netlify',
     async configureServer(viteDevServer) {
+      // if the vite dev server's http server isn't ready (or we're in
+      // middleware mode) let's not get involved
+      if (!viteDevServer.httpServer) {
+        return
+      }
       const logger = createLoggerFromViteLogger(viteDevServer.config.logger)
       const { blobs, edgeFunctions, functions, middleware = true, redirects, staticFiles } = options
 
-      netlifyDev = new NetlifyDev({
+      const netlifyDev = new NetlifyDev({
         blobs,
         edgeFunctions,
         functions,
@@ -45,21 +48,15 @@ export default function netlify(options: NetlifyPluginOptions = {}): any {
       })
 
       await netlifyDev.start()
+
+      viteDevServer.httpServer.once('close', () => {
+        netlifyDev.stop()
+      })
+
       logger.log('Environment loaded')
 
       if (middleware) {
         viteDevServer.middlewares.use(async function netlifyPreMiddleware(nodeReq, nodeRes, next) {
-          // This should never happen, but adding this escape hatch just in case.
-          if (!netlifyDev) {
-            logger.error(
-              'Some primitives will not work as expected due to an unknown error. Please restart your application.',
-            )
-
-            next()
-
-            return
-          }
-
           const headers: Record<string, string> = {}
           const result = await netlifyDev.handleAndIntrospectNodeRequest(nodeReq, {
             headersCollector: (key, value) => {
@@ -93,12 +90,6 @@ export default function netlify(options: NetlifyPluginOptions = {}): any {
         )
       }
     },
-
-    async closeBundle() {
-      await netlifyDev?.stop()
-
-      netlifyDev = undefined
-    },
   }
 
   return [plugin]