Make node-executor tolerate ZIP directory entries (#40542)

When node-executor downloads a source package, it verifies that the `metadata.json` file is correct by reading all entries from the source ZIP file and comparing them to `modulePaths` in `metadata.json`. However, the ZIP archiver used by node-executor integration tests also creates entries for directories, which makes tests fail if there is a module in a subfolder. This PR fixes node-executor to tolerate ZIP entries for directories, and also adds a subfolder module to tests.

GitOrigin-RevId: ac24d1eb27742620b73a0ae376069470926b40a5

Author: Nicolapps

npm-packages/node-executor/package.json

@@ -5,7 +5,7 @@
     "prebuild": "rm -rf dist",
     "build": "tsc && esbuild src/aws_lambda.ts --log-level=warning --bundle --sourcemap --platform=node --target=esnext --outfile=dist/aws_lambda.cjs && esbuild src/local.ts --log-level=warning --bundle --sourcemap --platform=node --target=esnext --outfile=dist/local.cjs",
     "pretest": "rm -rf dist",
-    "build-test-modules": "esbuild test/modules/*.ts --format=esm --log-level=warning --bundle --sourcemap --platform=node --target=esnext --outdir=dist/tests/modules && cp test/modules/*.js dist/tests/modules && cp test/metadata.json dist/tests/metadata.json && cp -r test/external_modules dist/tests/external_modules",
+    "build-test-modules": "esbuild test/modules/*.ts --format=esm --log-level=warning --bundle --sourcemap --platform=node --target=esnext --outdir=dist/tests/modules && rsync -a --include '*/' --include '*.js' --exclude '*' test/modules/ dist/tests/modules/ && cp test/metadata.json dist/tests/metadata.json && cp -r test/external_modules dist/tests/external_modules",
     "test": "vitest; npm run build-test-modules && esbuild test/integration-test.ts --log-level=warning --bundle --sourcemap --platform=node --target=esnext --outfile=dist/tests/integration-test.cjs && node --enable-source-maps dist/tests/integration-test.cjs"
   },
   "module": "esnext",

npm-packages/node-executor/src/source_package.ts

@@ -329,7 +329,16 @@ async function processSourcePackageStream(
   const startWrites = performance.now();
   const entries = await unzipFile(zipBuffer, dir, null);
   const actualModulePaths = entries
-    .filter((entry) => entry !== "metadata.json")
+    .filter(
+      (entry) =>
+        entry !== "metadata.json" &&
+        // Some ZIP implementations store entries for directories themselves
+        // (https://unix.stackexchange.com/a/743512/485280)
+        // The Rust implementation we use in production doesn’t do it, but some
+        // implementations (including the `archiver` npm package used in
+        // node-executor integration tests) do so, so we are filtering them out.
+        !entry.endsWith("/"),
+    )
     .map((entry) => entry.substring("modules/".length));
   await fs.promises.chmod(`${dir}/metadata.json`, "444");
   const metadataJson = parseMetadataFile(

npm-packages/node-executor/test/integration-test.ts

@@ -487,6 +487,7 @@ async function test_download() {
   const sourceDir = path.join(os.tmpdir(), `source/test_modules_key`);
   assert.equal(local.dir, sourceDir);
   assert.equal(local.modules.has("a.js"), true);
+  assert.equal(local.modules.has("someFolder/someFile.js"), true);
   // Non-node modules
   assert.equal(local.modules.has("third_party.js"), false);
   assert.equal(local.modules.has("d.js"), false);

npm-packages/node-executor/test/metadata.json

@@ -10,6 +10,7 @@
     "diamond.js",
     "left.js",
     "logging.js",
+    "someFolder/someFile.js",
     "right.js",
     "shared.js",
     "third_party.js",
@@ -29,6 +30,7 @@
     ["logging.js", "isolate"],
     ["right.js", "isolate"],
     ["shared.js", "isolate"],
+    ["someFolder/someFile.js", "node"],
     ["third_party.js", "isolate"],
     ["transitive.js", "isolate"]
   ]