review

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Author: flakey5

e2e-tests/util.ts

@@ -35,7 +35,9 @@ function populateDirectoryCache(directory: Directory): Array<Promise<unknown>> {
     files: Object.keys(directory.files).map(name => {
       const file = directory.files[name];
 
-      // TODO check for indx file
+      if (!hasIndexHtmlFile && name.match(/index.htm(?:l)$/)) {
+        hasIndexHtmlFile = true;
+      }
 
       return {
         name,
@@ -48,7 +50,7 @@ function populateDirectoryCache(directory: Directory): Array<Promise<unknown>> {
   };
   cachedDirectory.hasIndexHtmlFile = hasIndexHtmlFile;
 
-  const promises: Array<Promise<unknown>> = [
+  const promises: Array<Promise<void>> = [
     env.DIRECTORY_CACHE.put(
       `${directory.name}/`,
       JSON.stringify(cachedDirectory)

scripts/constants.mjs

@@ -20,6 +20,8 @@ export const STAGING_BUCKET = process.env.STAGING_BUCKET ?? 'dist-staging';
 export const RELEASE_DIR = 'nodejs/release/';
 export const DOCS_DIR = 'nodejs/docs/';
 
+export const NODE_LATEST_FILE_NAME = 'node-latest.tar.gz';
+
 export const DEV_BUCKET_PATH = join(import.meta.dirname, '..', 'dev-bucket');
 export const CACHED_DIRECTORIES_PATH = join(
   import.meta.dirname,

scripts/utils/addSymlinksToDirectoryCache.mjs

@@ -3,6 +3,7 @@ import { basename, dirname } from 'node:path';
 import { S3Client } from '@aws-sdk/client-s3';
 import {
   DOCS_DIR,
+  NODE_LATEST_FILE_NAME,
   PROD_BUCKET,
   RELEASE_DIR,
   STATIC_FILE_SYMLINKS_PATH,
@@ -24,7 +25,7 @@ export async function addLatestTarSymlinkToCache(
   latestVersionMap,
   latestVersion
 ) {
-  const nodeLatestPath = `${RELEASE_DIR}${latestVersionMap['node-latest.tar.gz'].replaceAll('latest', latestVersion)}`;
+  const nodeLatestPath = `${RELEASE_DIR}${latestVersionMap[NODE_LATEST_FILE_NAME].replaceAll('latest', latestVersion)}`;
 
   // Stat the file that `node-latest.tar.gz` points to so we can have accurate
   // size & last modified info for the directory listing. Also acts as a safety
@@ -37,7 +38,7 @@ export async function addLatestTarSymlinkToCache(
   }
 
   releaseDirectory.files.push({
-    name: 'node-latest.tar.gz',
+    name: NODE_LATEST_FILE_NAME,
     lastModified: nodeLatest.lastModified,
     size: nodeLatest.size,
   });
@@ -54,7 +55,8 @@ export function addLatestDirectorySymlinksToCache(
 ) {
   releaseDirectory.subdirectories.push(
     ...Object.keys(latestVersionMap)
-      .filter(version => version !== 'node-latest.tar.gz')
+      // We only want directories, remove the only file in the map
+      .filter(version => version !== NODE_LATEST_FILE_NAME)
       .map(version => `${version}/`)
   );
   releaseDirectory.subdirectories.sort();
@@ -116,14 +118,20 @@ export async function addStaticFileSymlinksToCache(
   // TODO: remove when KV is considered stable
   const directoriesIncludedInFileCache = new Set([RELEASE_DIR, DOCS_DIR]);
 
+  const fileSymlinksFile = await readFile(STATIC_FILE_SYMLINKS_PATH, 'utf8');
+
   /**
    * @type {Record<string, string>}
    */
-  const fileSymlinks = JSON.parse(
-    await readFile(STATIC_FILE_SYMLINKS_PATH, 'utf8')
-  );
-
-  // This isn't static, delete it for now
+  const fileSymlinks = JSON.parse(fileSymlinksFile);
+
+  // This file is an exception for two reasons:
+  //  1. It's dynamic and points to the latest Node version
+  //  2. It's handled specially and is technically in the root directory,
+  //     which we should never be listing thus don't need to add it to the
+  //     directory cache.
+  // So, let's remove it then add it back once we're done handling the rest of
+  // the static file symlinks.
   fileSymlinks['node-config-schema.json'] = undefined;
 
   // Add the symlinks to the directory cache