modern-tar 0.7.2 → 0.7.4

package/dist/fs/index.js

@@ -1,4 +1,4 @@
-import { a as normalizeBody, c as LINK, l as SYMLINK, n as createTarPacker, o as DIRECTORY, r as transformHeader, s as FILE, t as createUnpacker } from "../unpacker-EHw0ivci.js";
+import { a as normalizeBody, c as LINK, l as SYMLINK, n as createTarPacker, o as DIRECTORY, r as transformHeader, s as FILE, t as createUnpacker } from "../unpacker-CEuY-276.js";
 import * as fs from "node:fs/promises";
 import { cpus } from "node:os";
 import * as path from "node:path";
@@ -575,11 +575,13 @@ const createPathCache = (destDirPath, options) => {
 			}
 			const parentDir = path.dirname(outPath);
 			switch (type) {
-				case DIRECTORY:
+				case DIRECTORY: {
 					pathConflicts.set(normalizedName, DIRECTORY);
-					await prepareDirectory(outPath, dmode ?? mode);
+					const safeMode = mode ? mode & 511 : void 0;
+					await prepareDirectory(outPath, dmode ?? safeMode);
 					if (mtime) await fs.lutimes(outPath, mtime, mtime).catch(() => {});
 					return;
+				}
 				case FILE:
 					pathConflicts.set(normalizedName, FILE);
 					await prepareDirectory(parentDir);
@@ -633,37 +635,34 @@ function unpackTar(directoryPath, options = {}) {
 	const pathCache = createPathCache(directoryPath, options);
 	let currentFileStream = null;
 	let currentWriteCallback = null;
-	let needsDiscardBody = false;
 	return new Writable({
 		async write(chunk, _, cb) {
 			try {
 				unpacker.write(chunk);
-				if (needsDiscardBody) {
-					if (!unpacker.skipEntry()) {
-						cb();
-						return;
-					}
-					needsDiscardBody = false;
-				}
-				if (currentFileStream && currentWriteCallback) {
-					let needsDrain = false;
-					const writeCallback = currentWriteCallback;
-					while (!unpacker.isBodyComplete()) {
-						needsDrain = false;
-						if (unpacker.streamBody(writeCallback) === 0) if (needsDrain) await currentFileStream.waitDrain();
-						else {
+				if (unpacker.isEntryActive()) {
+					if (currentFileStream && currentWriteCallback) {
+						let needsDrain = false;
+						const writeCallback = currentWriteCallback;
+						while (!unpacker.isBodyComplete()) {
+							needsDrain = false;
+							if (unpacker.streamBody(writeCallback) === 0) if (needsDrain) await currentFileStream.waitDrain();
+							else {
+								cb();
+								return;
+							}
+						}
+						while (!unpacker.skipPadding()) {
 							cb();
 							return;
 						}
-					}
-					while (!unpacker.skipPadding()) {
+						const streamToClose = currentFileStream;
+						if (streamToClose) opQueue.add(() => streamToClose.end());
+						currentFileStream = null;
+						currentWriteCallback = null;
+					} else if (!unpacker.skipEntry()) {
 						cb();
 						return;
 					}
-					const streamToClose = currentFileStream;
-					if (streamToClose) opQueue.add(() => streamToClose.end());
-					currentFileStream = null;
-					currentWriteCallback = null;
 				}
 				while (true) {
 					const header = unpacker.readHeader();
@@ -674,7 +673,6 @@ function unpackTar(directoryPath, options = {}) {
 					const transformedHeader = transformHeader(header, options);
 					if (!transformedHeader) {
 						if (!unpacker.skipEntry()) {
-							needsDiscardBody = true;
 							cb();
 							return;
 						}
@@ -682,8 +680,9 @@ function unpackTar(directoryPath, options = {}) {
 					}
 					const outPath = await opQueue.add(() => pathCache.preparePath(transformedHeader));
 					if (outPath) {
+						const safeMode = transformedHeader.mode ? transformedHeader.mode & 511 : void 0;
 						const fileStream = createFileSink(outPath, {
-							mode: options.fmode ?? transformedHeader.mode ?? void 0,
+							mode: options.fmode ?? safeMode,
 							mtime: transformedHeader.mtime ?? void 0
 						});
 						let needsDrain = false;
@@ -710,7 +709,6 @@ function unpackTar(directoryPath, options = {}) {
 						}
 						opQueue.add(() => fileStream.end());
 					} else if (!unpacker.skipEntry()) {
-						needsDiscardBody = true;
 						cb();
 						return;
 					}

package/dist/{unpacker-EHw0ivci.js → unpacker-CEuY-276.js}

@@ -108,7 +108,7 @@ function readNumeric(view, offset, size) {
 
 //#endregion
 //#region src/tar/body.ts
-const isBodyless = (header) => header.type === DIRECTORY || header.type === SYMLINK || header.type === LINK;
+const isBodyless = (header) => header.type === DIRECTORY || header.type === SYMLINK || header.type === LINK || header.type === "character-device" || header.type === "block-device" || header.type === "fifo";
 async function normalizeBody(body) {
 	if (body === null || body === void 0) return EMPTY;
 	if (body instanceof Uint8Array) return body;
@@ -256,6 +256,7 @@ function parseUstarHeader(block, strict) {
 		linkname: readString(block, USTAR_LINKNAME_OFFSET, USTAR_LINKNAME_SIZE)
 	};
 	const magic = readString(block, USTAR_MAGIC_OFFSET, USTAR_MAGIC_SIZE);
+	if (isBodyless(header)) header.size = 0;
 	if (magic.trim() === "ustar") {
 		header.uname = readString(block, USTAR_UNAME_OFFSET, USTAR_UNAME_SIZE);
 		header.gname = readString(block, USTAR_GNAME_OFFSET, USTAR_GNAME_SIZE);
@@ -275,8 +276,8 @@ const PAX_MAPPING = {
 };
 function parsePax(buffer) {
 	const decoder$1 = new TextDecoder("utf-8");
-	const overrides = {};
-	const pax = {};
+	const overrides = Object.create(null);
+	const pax = Object.create(null);
 	let offset = 0;
 	while (offset < buffer.length) {
 		const spaceIndex = buffer.indexOf(32, offset);
@@ -287,9 +288,8 @@ function parsePax(buffer) {
 		const [key, value] = decoder$1.decode(buffer.subarray(spaceIndex + 1, recordEnd - 1)).split("=", 2);
 		if (key && value !== void 0) {
 			pax[key] = value;
-			const mapping = PAX_MAPPING[key];
-			if (mapping) {
-				const [targetKey, parser] = mapping;
+			if (Object.hasOwn(PAX_MAPPING, key)) {
+				const [targetKey, parser] = PAX_MAPPING[key];
 				const parsedValue = parser(value);
 				if (typeof parsedValue === "string" || !Number.isNaN(parsedValue)) overrides[targetKey] = parsedValue;
 			}
@@ -562,16 +562,20 @@ function createChunkQueue() {
 //#region src/tar/unpacker.ts
 const STATE_HEADER = 0;
 const STATE_BODY = 1;
+const truncateErr = /* @__PURE__ */ new Error("Tar archive is truncated.");
 function createUnpacker(options = {}) {
 	const strict = options.strict ?? false;
 	const { available, peek, push, discard, pull } = createChunkQueue();
 	let state = STATE_HEADER;
 	let ended = false;
+	let done = false;
 	let eof = false;
 	let currentEntry = null;
 	const paxGlobals = {};
 	let nextEntryOverrides = {};
 	const unpacker = {
+		isEntryActive: () => state === STATE_BODY,
+		isBodyComplete: () => !currentEntry || currentEntry.remaining === 0,
 		write(chunk) {
 			if (ended) throw new Error("Archive already ended.");
 			push(chunk);
@@ -581,12 +585,12 @@ function createUnpacker(options = {}) {
 		},
 		readHeader() {
 			if (state !== STATE_HEADER) throw new Error("Cannot read header while an entry is active");
-			if (eof) return void 0;
-			while (!eof) {
+			if (done) return void 0;
+			while (!done) {
 				if (available() < BLOCK_SIZE) {
 					if (ended) {
-						if (available() > 0 && strict) throw new Error("Tar archive is truncated.");
-						eof = true;
+						if (available() > 0 && strict) throw truncateErr;
+						done = true;
 						return;
 					}
 					return null;
@@ -595,14 +599,15 @@ function createUnpacker(options = {}) {
 				if (isZeroBlock(headerBlock)) {
 					if (available() < BLOCK_SIZE * 2) {
 						if (ended) {
-							if (strict) throw new Error("Tar archive is truncated.");
-							eof = true;
+							if (strict) throw truncateErr;
+							done = true;
 							return;
 						}
 						return null;
 					}
 					if (isZeroBlock(peek(BLOCK_SIZE * 2).subarray(BLOCK_SIZE))) {
 						discard(BLOCK_SIZE * 2);
+						done = true;
 						eof = true;
 						return;
 					}
@@ -622,7 +627,7 @@ function createUnpacker(options = {}) {
 				if (metaParser) {
 					const paddedSize = internalHeader.size + BLOCK_SIZE_MASK & ~BLOCK_SIZE_MASK;
 					if (available() < BLOCK_SIZE + paddedSize) {
-						if (ended && strict) throw new Error("Tar archive is truncated.");
+						if (ended && strict) throw truncateErr;
 						return null;
 					}
 					discard(BLOCK_SIZE);
@@ -636,6 +641,7 @@ function createUnpacker(options = {}) {
 				if (internalHeader.prefix) header.name = `${internalHeader.prefix}/${header.name}`;
 				applyOverrides(header, paxGlobals);
 				applyOverrides(header, nextEntryOverrides);
+				if (header.name.endsWith("/") && header.type === FILE) header.type = DIRECTORY;
 				nextEntryOverrides = {};
 				currentEntry = {
 					header,
@@ -654,9 +660,6 @@ function createUnpacker(options = {}) {
 			currentEntry.remaining -= fed;
 			return fed;
 		},
-		isBodyComplete() {
-			return !currentEntry || currentEntry.remaining === 0;
-		},
 		skipPadding() {
 			if (state !== STATE_BODY || !currentEntry) return true;
 			if (currentEntry.remaining > 0) throw new Error("Body not fully consumed");
@@ -668,12 +671,20 @@ function createUnpacker(options = {}) {
 		},
 		skipEntry() {
 			if (state !== STATE_BODY || !currentEntry) return true;
-			while (!unpacker.isBodyComplete()) if (unpacker.streamBody(() => true) === 0) return false;
+			const toDiscard = Math.min(currentEntry.remaining, available());
+			if (toDiscard > 0) {
+				discard(toDiscard);
+				currentEntry.remaining -= toDiscard;
+			}
+			if (currentEntry.remaining > 0) return false;
 			return unpacker.skipPadding();
 		},
 		validateEOF() {
-			if (strict && available() > 0) {
-				if (pull(available()).some((byte) => byte !== 0)) throw new Error("Invalid EOF.");
+			if (strict) {
+				if (!eof) throw truncateErr;
+				if (available() > 0) {
+					if (pull(available()).some((byte) => byte !== 0)) throw new Error("Invalid EOF.");
+				}
 			}
 		}
 	};

package/dist/web/index.js

@@ -1,4 +1,4 @@
-import { a as normalizeBody, i as isBodyless, n as createTarPacker$1, r as transformHeader, t as createUnpacker } from "../unpacker-EHw0ivci.js";
+import { a as normalizeBody, i as isBodyless, n as createTarPacker$1, r as transformHeader, t as createUnpacker } from "../unpacker-CEuY-276.js";
 
 //#region src/web/compression.ts
 function createGzipEncoder() {
@@ -71,6 +71,7 @@ async function streamToBuffer(stream) {
 		reader.releaseLock();
 	}
 }
+const drain = (stream) => stream.pipeTo(new WritableStream());
 
 //#endregion
 //#region src/web/unpack.ts
@@ -78,93 +79,45 @@ function createTarDecoder(options = {}) {
 	const unpacker = createUnpacker(options);
 	let bodyController = null;
 	let pumping = false;
-	let controllerTerminated = false;
-	let eofReached = false;
-	const abortAll = (reason, controller) => {
-		if (controllerTerminated) return;
-		controllerTerminated = true;
-		const error = reason instanceof Error ? reason : new Error(String(reason ?? ""));
-		if (bodyController) {
-			try {
-				bodyController.error(error);
-			} catch {}
-			bodyController = null;
-		}
-		if (controller) try {
-			controller.error(error);
-		} catch {}
-	};
-	const pump = (controller, force = false) => {
-		if (pumping || controllerTerminated || eofReached) return;
+	const pump = (controller) => {
+		if (pumping) return;
 		pumping = true;
 		try {
-			while (!controllerTerminated) {
-				if (!bodyController) {
-					if (!unpacker.skipEntry()) break;
-					if (!force && (controller.desiredSize ?? 0) < 0) break;
-					const header = unpacker.readHeader();
-					if (header === null) break;
-					if (header === void 0) {
-						eofReached = true;
-						break;
-					}
-					const body = new ReadableStream({
-						start: (c) => bodyController = c,
+			while (true) if (unpacker.isEntryActive()) {
+				if (bodyController) {
+					if (unpacker.streamBody((c) => (bodyController.enqueue(c), true)) === 0 && !unpacker.isBodyComplete()) break;
+				} else if (!unpacker.skipEntry()) break;
+				if (unpacker.isBodyComplete()) {
+					try {
+						bodyController?.close();
+					} catch {}
+					bodyController = null;
+					if (!unpacker.skipPadding()) break;
+				}
+			} else {
+				const header = unpacker.readHeader();
+				if (header === null || header === void 0) break;
+				controller.enqueue({
+					header,
+					body: new ReadableStream({
+						start(c) {
+							if (header.size === 0) c.close();
+							else bodyController = c;
+						},
 						pull: () => pump(controller),
-						cancel: () => {
+						cancel() {
 							bodyController = null;
 							pump(controller);
 						}
-					});
-					controller.enqueue({
-						header,
-						body
-					});
-					if (header.size === 0) {
-						try {
-							bodyController.close();
-						} catch {}
-						bodyController = null;
-						if (!unpacker.skipPadding()) break;
-						continue;
-					}
-				}
-				if (unpacker.isBodyComplete()) {
-					if (unpacker.skipPadding()) {
-						try {
-							bodyController.close();
-						} catch {}
-						bodyController = null;
-						continue;
-					}
-					break;
-				}
-				if ((bodyController.desiredSize ?? 1) <= 0) break;
-				let shouldPause = false;
-				if (unpacker.streamBody((chunk) => {
-					if (!bodyController) return true;
-					try {
-						bodyController.enqueue(chunk);
-						if ((bodyController.desiredSize ?? 1) <= 0) shouldPause = true;
-					} catch {
-						return true;
-					}
-					return true;
-				}) === 0) break;
-				if (unpacker.isBodyComplete()) {
-					if (unpacker.skipPadding()) {
-						try {
-							bodyController.close();
-						} catch {}
-						bodyController = null;
-						continue;
-					}
-					break;
-				}
-				if (shouldPause) break;
+					})
+				});
 			}
 		} catch (error) {
-			abortAll(error, controller);
+			try {
+				bodyController?.error(error);
+			} catch {}
+			bodyController = null;
+			throw error;
 		} finally {
 			pumping = false;
 		}
@@ -172,29 +125,27 @@ function createTarDecoder(options = {}) {
 	return new TransformStream({
 		transform(chunk, controller) {
 			try {
-				if (eofReached && options.strict && chunk.some((byte) => byte !== 0)) throw new Error("Invalid EOF.");
 				unpacker.write(chunk);
 				pump(controller);
 			} catch (error) {
-				abortAll(error, controller);
+				try {
+					bodyController?.error(error);
+				} catch {}
 				throw error;
 			}
 		},
 		flush(controller) {
 			try {
 				unpacker.end();
-				pump(controller, true);
-				if (bodyController) {
-					if (options.strict) throw new Error("Tar archive is truncated.");
-					try {
-						bodyController.close();
-					} catch {}
-					bodyController = null;
-				}
+				pump(controller);
 				unpacker.validateEOF();
-				if (!controllerTerminated) controller.terminate();
+				if (unpacker.isEntryActive() && !unpacker.isBodyComplete()) try {
+					bodyController?.close();
+				} catch {}
 			} catch (error) {
-				abortAll(error, controller);
+				try {
+					bodyController?.error(error);
+				} catch {}
 				throw error;
 			}
 		}
@@ -245,15 +196,12 @@ async function unpackTar(archive, options = {}) {
 			throw error;
 		}
 		if (processedHeader === null) {
-			await entry.body.cancel();
+			await drain(entry.body);
 			continue;
 		}
 		if (isBodyless(processedHeader)) {
-			await entry.body.cancel();
-			results.push({
-				header: processedHeader,
-				data: void 0
-			});
+			await drain(entry.body);
+			results.push({ header: processedHeader });
 		} else results.push({
 			header: processedHeader,
 			data: await streamToBuffer(entry.body)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "modern-tar",
-	"version": "0.7.2",
+	"version": "0.7.4",
 	"description": "Zero dependency streaming tar parser and writer for JavaScript.",
 	"author": "Ayuhito <hello@ayuhito.com>",
 	"license": "MIT",
@@ -25,12 +25,13 @@
 		}
 	},
 	"devDependencies": {
-		"@biomejs/biome": "2.3.5",
-		"@types/node": "^24.10.1",
-		"@vitest/coverage-v8": "^4.0.8",
-		"tsdown": "^0.16.3",
+		"@biomejs/biome": "2.3.8",
+		"@types/node": "^25.0.2",
+		"@vitest/browser-playwright": "4.0.15",
+		"@vitest/coverage-v8": "4.0.15",
+		"tsdown": "^0.18.0",
 		"typescript": "^5.9.3",
-		"vitest": "^4.0.8"
+		"vitest": "4.0.15"
 	},
 	"scripts": {
 		"build": "tsdown",
@@ -38,7 +39,8 @@
 		"test": "vitest",
 		"coverage": "vitest run --coverage",
 		"check": "biome check --write",
-		"typecheck": "tsc --noEmit"
+		"typecheck": "tsc --noEmit",
+		"test:browser": "vitest --config=vitest.browser.config.ts --browser"
 	},
 	"files": [
 		"dist",