fix(mod_unpack): iterate directories with opendirSync/readSync to avoid missing entries on XFS and ensure directory handles are closed
This commit is contained in:
@@ -1,5 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-05 - 4.1.24 - fix(mod_unpack)
|
||||||
|
iterate directories with opendirSync/readSync to avoid missing entries on XFS and ensure directory handles are closed
|
||||||
|
|
||||||
|
- Replaced readdirSync loops with opendirSync + readSync for destination and nested directories to provide a single stable directory handle during iteration
|
||||||
|
- Added explicit closeSync() calls to close directory handles and avoid resource leaks
|
||||||
|
- Avoids partial results/missed entries that can occur when repeatedly calling readdirSync (observed on XFS with delayed metadata)
|
||||||
|
- Preserves existing renameSync move logic and increments moved counter while cleaning up the now-empty nested directory
|
||||||
|
|
||||||
## 2026-03-05 - 4.1.23 - fix(mod_unpack)
|
## 2026-03-05 - 4.1.23 - fix(mod_unpack)
|
||||||
handle partial readdirSync results when moving nested directory entries and add diagnostic log
|
handle partial readdirSync results when moving nested directory entries and add diagnostic log
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@git.zone/tsbuild',
|
name: '@git.zone/tsbuild',
|
||||||
version: '4.1.23',
|
version: '4.1.24',
|
||||||
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
|
description: 'A tool for compiling TypeScript files using the latest nightly features, offering flexible APIs and a CLI for streamlined development.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -108,27 +108,31 @@ export class TsUnpacker {
|
|||||||
const nestedPath = this.getNestedPath();
|
const nestedPath = this.getNestedPath();
|
||||||
|
|
||||||
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
||||||
const destEntries = fs.readdirSync(this.destDir);
|
// Use opendirSync to keep a single directory handle open for reliable iteration
|
||||||
for (const entry of destEntries) {
|
const destDir = fs.opendirSync(this.destDir);
|
||||||
if (entry !== this.sourceFolderName) {
|
let destEntry;
|
||||||
fs.rmSync(path.join(this.destDir, entry), { recursive: true, force: true });
|
while ((destEntry = destDir.readSync()) !== null) {
|
||||||
|
if (destEntry.name !== this.sourceFolderName) {
|
||||||
|
fs.rmSync(path.join(this.destDir, destEntry.name), { recursive: true, force: true });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
destDir.closeSync();
|
||||||
|
|
||||||
// Step 2: Move all contents from nested dir up to dest dir
|
// Step 2: Move all contents from nested dir up to dest dir
|
||||||
// Use a loop to handle any partial readdirSync results
|
// 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;
|
let moved = 0;
|
||||||
while (true) {
|
while ((nestedEntry = nestedDir.readSync()) !== null) {
|
||||||
const entries = fs.readdirSync(nestedPath);
|
|
||||||
if (entries.length === 0) break;
|
|
||||||
for (const entry of entries) {
|
|
||||||
fs.renameSync(
|
fs.renameSync(
|
||||||
path.join(nestedPath, entry),
|
path.join(nestedPath, nestedEntry.name),
|
||||||
path.join(this.destDir, entry),
|
path.join(this.destDir, nestedEntry.name),
|
||||||
);
|
);
|
||||||
moved++;
|
moved++;
|
||||||
}
|
}
|
||||||
}
|
nestedDir.closeSync();
|
||||||
|
|
||||||
// Step 3: Remove the now-empty nested directory
|
// Step 3: Remove the now-empty nested directory
|
||||||
fs.rmdirSync(nestedPath);
|
fs.rmdirSync(nestedPath);
|
||||||
|
|||||||
Reference in New Issue
Block a user