fix: potential race condition

kptdobe · kptdobe · commit 32026d9951d0 · 2026-03-19T17:29:47.000+01:00
diff --git a/src/server/HelixServer.js b/src/server/HelixServer.js
@@ -361,41 +361,41 @@ export class HelixServer extends BaseServer {
       const contentFilePath = path.join(contentDir, ctx.path);
       if (!path.relative(contentDir, contentFilePath).startsWith('..')) {
         try {
-          const contentStat = await lstat(contentFilePath);
-          if (contentStat.isFile()) {
-            if (contentFilePath.endsWith('.html')) {
-              let htmlContent = await readFile(contentFilePath, 'utf-8');
-              // aem-content files are plain HTML (body only, no <head>)
-              // wrap with a full document and inject local head.html
-              if (!htmlContent.includes('<head>')) {
-                await this._project.headHtml.update();
-                const headHtml = this._project.headHtml.localHtml || '';
-                htmlContent = `<html><head>${headHtml}</head>${htmlContent}</html>`;
-              } else {
-                await this._project.headHtml.setCookie(req.headers.cookie);
-                htmlContent = await this._project.headHtml.replace(htmlContent);
-              }
-              if (liveReload) {
-                htmlContent = utils.injectLiveReloadScript(htmlContent, this);
-                liveReload.registerFile(ctx.requestId, contentFilePath);
-              }
-              res.set({
-                'content-type': 'text/html; charset=utf-8',
-                'access-control-allow-origin': '*',
-              });
-              res.send(htmlContent);
+          if (contentFilePath.endsWith('.html')) {
+            // readFile throws EISDIR for directories and ENOENT for missing files
+            let htmlContent = await readFile(contentFilePath, 'utf-8');
+            // aem-content files are plain HTML (body only, no <head>)
+            // wrap with a full document and inject local head.html
+            if (!htmlContent.includes('<head>')) {
+              await this._project.headHtml.update();
+              const headHtml = this._project.headHtml.localHtml || '';
+              htmlContent = `<html><head>${headHtml}</head>${htmlContent}</html>`;
             } else {
-              await sendFile(contentFilePath, {
-                dotfiles: 'allow',
-                headers: { 'access-control-allow-origin': '*' },
-              });
-              if (liveReload) {
-                liveReload.registerFile(ctx.requestId, contentFilePath);
-              }
+              await this._project.headHtml.setCookie(req.headers.cookie);
+              htmlContent = await this._project.headHtml.replace(htmlContent);
             }
+            if (liveReload) {
+              htmlContent = utils.injectLiveReloadScript(htmlContent, this);
+              liveReload.registerFile(ctx.requestId, contentFilePath);
+            }
+            res.set({
+              'content-type': 'text/html; charset=utf-8',
+              'access-control-allow-origin': '*',
+            });
+            res.send(htmlContent);
             log.debug(`${pfx}served from aem-content/: ${ctx.path}`);
             return;
           }
+          // sendFile throws EISDIR for directories and ENOENT for missing files
+          await sendFile(contentFilePath, {
+            dotfiles: 'allow',
+            headers: { 'access-control-allow-origin': '*' },
+          });
+          if (liveReload) {
+            liveReload.registerFile(ctx.requestId, contentFilePath);
+          }
+          log.debug(`${pfx}served from aem-content/: ${ctx.path}`);
+          return;
         } catch (e) {
           log.debug(`${pfx}aem-content/ miss for ${ctx.path}: ${e.code}`);
         }
