fix(mod_unpack): flush directory metadata on XFS before reading and use readdirSync-based iteration to avoid missing entries when unpacking

This commit is contained in:
2026-03-05 15:13:36 +00:00
parent 0e1db4bb85
commit 67d29a8e77
3 changed files with 28 additions and 20 deletions

View File

@@ -107,39 +107,40 @@ export class TsUnpacker {
const nestedPath = this.getNestedPath();
// Force XFS to flush pending directory metadata before reading.
// XFS delayed logging (CIL) can defer metadata commits, causing
// readdirSync/opendirSync to return incomplete results immediately
// after TypeScript's emit() creates files via writeFileSync.
const destFd = fs.openSync(this.destDir, 'r');
fs.fsyncSync(destFd);
fs.closeSync(destFd);
const nestedFd = fs.openSync(nestedPath, 'r');
fs.fsyncSync(nestedFd);
fs.closeSync(nestedFd);
// Step 1: Remove sibling entries (everything in dest except the source folder)
// Use opendirSync to keep a single directory handle open for reliable iteration
const destDir = fs.opendirSync(this.destDir);
let destEntry;
while ((destEntry = destDir.readSync()) !== null) {
if (destEntry.name !== this.sourceFolderName) {
fs.rmSync(path.join(this.destDir, destEntry.name), { recursive: true, force: true });
const destEntries = fs.readdirSync(this.destDir);
for (const entry of destEntries) {
if (entry !== this.sourceFolderName) {
fs.rmSync(path.join(this.destDir, entry), { recursive: true, force: true });
}
}
destDir.closeSync();
// Step 2: Move all contents from nested dir up to dest dir
// Use opendirSync to keep a single directory handle open — this avoids
// partial results from readdirSync which opens a fresh file descriptor
// each call and can miss entries on XFS with delayed metadata logging
const nestedDir = fs.opendirSync(nestedPath);
let nestedEntry;
let moved = 0;
while ((nestedEntry = nestedDir.readSync()) !== null) {
const nestedEntries = fs.readdirSync(nestedPath);
for (const entry of nestedEntries) {
fs.renameSync(
path.join(nestedPath, nestedEntry.name),
path.join(this.destDir, nestedEntry.name),
path.join(nestedPath, entry),
path.join(this.destDir, entry),
);
moved++;
}
nestedDir.closeSync();
// Step 3: Remove the now-empty nested directory
fs.rmdirSync(nestedPath);
// Diagnostic: verify final state
const finalEntries = fs.readdirSync(this.destDir);
console.log(` 📦 Unpacked ${this.sourceFolderName}: moved ${moved} entries, final: ${finalEntries.length} entries`);
console.log(` 📦 Unpacked ${this.sourceFolderName}: moved ${nestedEntries.length} entries, final: ${finalEntries.length} entries`);
return true;
}