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:
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
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.'
|
||||
}
|
||||
|
||||
@@ -108,27 +108,31 @@ export class TsUnpacker {
|
||||
const nestedPath = this.getNestedPath();
|
||||
|
||||
// Step 1: Remove sibling entries (everything in dest except the source folder)
|
||||
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 });
|
||||
// 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 });
|
||||
}
|
||||
}
|
||||
destDir.closeSync();
|
||||
|
||||
// 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;
|
||||
while (true) {
|
||||
const entries = fs.readdirSync(nestedPath);
|
||||
if (entries.length === 0) break;
|
||||
for (const entry of entries) {
|
||||
fs.renameSync(
|
||||
path.join(nestedPath, entry),
|
||||
path.join(this.destDir, entry),
|
||||
);
|
||||
moved++;
|
||||
}
|
||||
while ((nestedEntry = nestedDir.readSync()) !== null) {
|
||||
fs.renameSync(
|
||||
path.join(nestedPath, nestedEntry.name),
|
||||
path.join(this.destDir, nestedEntry.name),
|
||||
);
|
||||
moved++;
|
||||
}
|
||||
nestedDir.closeSync();
|
||||
|
||||
// Step 3: Remove the now-empty nested directory
|
||||
fs.rmdirSync(nestedPath);
|
||||
|
||||
Reference in New Issue
Block a user