mirror of
https://github.com/oven-sh/bun
synced 2026-02-09 18:38:55 +00:00
### What does this PR do? Fixes #24007 Possibly fixes https://github.com/oven-sh/bun/issues/18902, https://github.com/oven-sh/bun/issues/7412 Some filesystems (bind mounts, FUSE, NFS) don't provide `d_type` in directory entries, returning `DT_UNKNOWN`. This caused glob and recursive readdir to skip entries entirely. ## Problem On Linux filesystems that don't populate `d_type` in directory entries (bind mounts, FUSE, NFS, some ext4 configurations), `readdir()` returns `DT_UNKNOWN` instead of the actual file type. This caused: - `Bun.Glob` to skip files/directories entirely - `fs.readdirSync(..., {recursive: true})` to not recurse into subdirectories - `fs.readdirSync(..., {withFileTypes: true})` to report incorrect types ## Solution Implemented a **lazy `lstatat()` fallback** when `d_type == DT_UNKNOWN`: - **`sys.zig`**: Added `lstatat()` function - same as `fstatat()` but with `AT_SYMLINK_NOFOLLOW` flag to correctly identify symlinks - **`GlobWalker.zig`**: When encountering `.unknown` entries, first check if filename matches pattern, then call `lstatat()` only if needed - **`node_fs.zig`**: Handle `.unknown` in both async and sync recursive readdir paths; propagate resolved kind to Dirent objects - **`dir_iterator.zig`**: Return `.unknown` for `DT_UNKNOWN` entries, letting callers handle lazy stat **Why `lstatat` instead of `fstatat`?** We use `AT_SYMLINK_NOFOLLOW` to preserve consistent behavior with normal filesystems - symlinks should be reported as symlinks, not as their target type. This matches [Node.js behavior](https://github.com/nodejs/node/blob/main/lib/internal/fs/utils.js#L251-L269) which uses `lstat()` for the DT_UNKNOWN fallback, and follows the lazy stat pattern established in PR #18172. ### How did you verify your code works? **Testing:** - Regression test: `test/regression/issue/24007.test.ts` - FUSE filesystem test: `test/cli/run/glob-on-fuse.test.ts` (reuses `fuse-fs.py` from PR #18172, includes symlink verification) - All existing glob/readdir tests pass - **Verified in Docker bind-mount environment:** - Official Bun: `0 files` - Patched Bun: `3 files` **Performance:** No impact on normal filesystems - the `.unknown` branch is only hit when `d_type == DT_UNKNOWN`. The lazy stat pattern avoids unnecessary syscalls by checking pattern match first. --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Jarred Sumner <jarred@jarredsumner.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
129 lines
4.7 KiB
TypeScript
129 lines
4.7 KiB
TypeScript
/**
|
|
* Regression test for GitHub issue #24007
|
|
* https://github.com/oven-sh/bun/issues/24007
|
|
*
|
|
* Issue: Bun's glob/readdir functionality failed on bind-mounted paths in Docker
|
|
* because certain filesystems (sshfs, fuse, NFS, bind mounts) don't provide d_type
|
|
* information in directory entries (returns DT_UNKNOWN).
|
|
*
|
|
* Fix: Added lstatat() fallback when d_type is unknown, following the lazy stat
|
|
* pattern from PR #18172.
|
|
*
|
|
* See also: test/cli/run/glob-on-fuse.test.ts for FUSE filesystem testing.
|
|
*/
|
|
import { describe, expect, test } from "bun:test";
|
|
import { tempDir } from "harness";
|
|
import fs from "node:fs";
|
|
import path from "node:path";
|
|
|
|
describe.concurrent("issue #24007 - glob with recursive patterns", () => {
|
|
test("recursive glob pattern **/*.ts finds nested files", () => {
|
|
using dir = tempDir("issue-24007", {
|
|
"server/api/health.get.ts": "export default () => 'ok';",
|
|
"server/api/users/list.ts": "export default () => [];",
|
|
"server/routes/index.ts": "export default {};",
|
|
"server/routes/admin/dashboard.ts": "export default {};",
|
|
"config.ts": "export default {};",
|
|
});
|
|
|
|
const cwd = String(dir);
|
|
|
|
// Test recursive pattern with **
|
|
const results = fs.globSync("**/*.ts", { cwd });
|
|
|
|
expect(results).toContain("config.ts");
|
|
expect(results).toContain(path.join("server", "api", "health.get.ts"));
|
|
expect(results).toContain(path.join("server", "api", "users", "list.ts"));
|
|
expect(results).toContain(path.join("server", "routes", "index.ts"));
|
|
expect(results).toContain(path.join("server", "routes", "admin", "dashboard.ts"));
|
|
expect(results.length).toBe(5);
|
|
});
|
|
|
|
test("recursive glob pattern server/**/*.ts finds files in subdirectory", () => {
|
|
using dir = tempDir("issue-24007-subdir", {
|
|
"server/api/health.get.ts": "x",
|
|
"server/routes/status.ts": "x",
|
|
"other/file.ts": "x",
|
|
});
|
|
|
|
const cwd = String(dir);
|
|
const results = fs.globSync("server/**/*.ts", { cwd });
|
|
|
|
expect(results).toContain(path.join("server", "api", "health.get.ts"));
|
|
expect(results).toContain(path.join("server", "routes", "status.ts"));
|
|
expect(results).not.toContain(path.join("other", "file.ts"));
|
|
expect(results.length).toBe(2);
|
|
});
|
|
|
|
test("top-level glob pattern server/*.ts finds direct children", () => {
|
|
using dir = tempDir("issue-24007-toplevel", {
|
|
"server/index.ts": "x",
|
|
"server/config.ts": "x",
|
|
"server/nested/deep.ts": "x",
|
|
});
|
|
|
|
const cwd = String(dir);
|
|
const results = fs.globSync("server/*.ts", { cwd });
|
|
|
|
expect(results).toContain(path.join("server", "index.ts"));
|
|
expect(results).toContain(path.join("server", "config.ts"));
|
|
expect(results).not.toContain(path.join("server", "nested", "deep.ts"));
|
|
expect(results.length).toBe(2);
|
|
});
|
|
|
|
test("Bun.Glob recursive scan finds nested files", () => {
|
|
using dir = tempDir("issue-24007-bun-glob", {
|
|
"api/health.get.ts": "x",
|
|
"api/users/index.ts": "x",
|
|
"routes/home.ts": "x",
|
|
});
|
|
|
|
const cwd = String(dir);
|
|
const glob = new Bun.Glob("**/*.ts");
|
|
const results = Array.from(glob.scanSync({ cwd }));
|
|
|
|
expect(results).toContain(path.join("api", "health.get.ts"));
|
|
expect(results).toContain(path.join("api", "users", "index.ts"));
|
|
expect(results).toContain(path.join("routes", "home.ts"));
|
|
expect(results.length).toBe(3);
|
|
});
|
|
|
|
test("fs.readdirSync with recursive option finds all files", () => {
|
|
using dir = tempDir("issue-24007-readdir", {
|
|
"a/b/c/file.txt": "content",
|
|
"a/b/file.txt": "content",
|
|
"a/file.txt": "content",
|
|
"file.txt": "content",
|
|
});
|
|
|
|
const cwd = String(dir);
|
|
const results = fs.readdirSync(cwd, { recursive: true });
|
|
|
|
expect(results).toContain("file.txt");
|
|
expect(results).toContain(path.join("a", "file.txt"));
|
|
expect(results).toContain(path.join("a", "b", "file.txt"));
|
|
expect(results).toContain(path.join("a", "b", "c", "file.txt"));
|
|
});
|
|
|
|
test("fs.readdirSync with recursive and withFileTypes returns correct types", () => {
|
|
using dir = tempDir("issue-24007-dirent", {
|
|
"dir/subdir/file.txt": "content",
|
|
"dir/another.txt": "content",
|
|
});
|
|
|
|
const cwd = String(dir);
|
|
const results = fs.readdirSync(cwd, { recursive: true, withFileTypes: true });
|
|
|
|
// Find the nested file in dir/subdir/
|
|
const expectedParent = path.join(cwd, "dir", "subdir");
|
|
const nestedFile = results.find(d => d.name === "file.txt" && d.parentPath === expectedParent);
|
|
expect(nestedFile).toBeDefined();
|
|
expect(nestedFile!.isFile()).toBe(true);
|
|
|
|
// Find a directory entry
|
|
const dirEntry = results.find(d => d.name === "subdir");
|
|
expect(dirEntry).toBeDefined();
|
|
expect(dirEntry!.isDirectory()).toBe(true);
|
|
});
|
|
});
|