git.zone/tsbuild
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mod_unpack): handle partial readdir results from signal-interrupted getdents64 when unpacking to ensure sibling removal and nested moves complete

Browse Source
This commit is contained in:
Jürgen Kunz
2026-03-05 14:30:33 +00:00
parent f521530eed
commit 25372bf97d
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog.md
View File

@@ -1,5 +1,12 @@
# Changelog # Changelog
## 2026-03-05 - 4.1.16 - fix(mod_unpack)
handle partial readdir results from signal-interrupted getdents64 when unpacking to ensure sibling removal and nested moves complete
- Loop readdir calls for destination directory until only the source folder remains to avoid partial-listing leftovers
- Loop readdir calls for nested directory and repeatedly rename entries until the nested directory is empty
- Prevents leftover files and incomplete moves when readdir returns partial results under signals
## 2026-03-05 - 4.1.15 - fix(mod_unpack) ## 2026-03-05 - 4.1.15 - fix(mod_unpack)
flatten nested output directory without temporary rename steps to avoid race conditions flatten nested output directory without temporary rename steps to avoid race conditions

2
ts/00_commitinfo_data.ts
View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@git.zone/tsbuild', name: '@git.zone/tsbuild',
version: '4.1.15', version: '4.1.16',
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.'
} }

28
ts/mod_unpack/classes.tsunpacker.ts
View File

@@ -108,20 +108,28 @@ 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 = await fs.promises.readdir(this.destDir); // Loop handles partial readdir results from signal-interrupted getdents64
for (const entry of destEntries) { let destEntries = await fs.promises.readdir(this.destDir);
if (entry !== this.sourceFolderName) { while (destEntries.some(e => e !== this.sourceFolderName)) {
await fs.promises.rm(path.join(this.destDir, entry), { recursive: true, force: true }); for (const entry of destEntries) {
if (entry !== this.sourceFolderName) {
await fs.promises.rm(path.join(this.destDir, entry), { recursive: true, force: true });
}
} }
destEntries = await fs.promises.readdir(this.destDir);
} }
// Step 2: Move all contents from nested dir up to dest dir // Step 2: Move all contents from nested dir up to dest dir
const nestedEntries = await fs.promises.readdir(nestedPath); // Loop handles partial readdir results from signal-interrupted getdents64
for (const entry of nestedEntries) { let nestedEntries = await fs.promises.readdir(nestedPath);
await fs.promises.rename( while (nestedEntries.length > 0) {
path.join(nestedPath, entry), for (const entry of nestedEntries) {
path.join(this.destDir, entry), await fs.promises.rename(
); path.join(nestedPath, entry),
path.join(this.destDir, entry),
);
}
nestedEntries = await fs.promises.readdir(nestedPath);
} }
// Step 3: Remove the now-empty nested directory // Step 3: Remove the now-empty nested directory