@zip.js/zip.js 2.6.5 → 2.6.8

package/dist/zip-fs.js

@@ -2705,6 +2705,12 @@
 		return protocol == "http:" || protocol == "https:";
 	}
 
+	async function initStream(stream) {
+		if (stream.init && !stream.initialized) {
+			await stream.init();
+		}
+	}
+
 	/*
 	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
 
@@ -2949,9 +2955,7 @@
 			const zipReader = this;
 			let { reader } = zipReader;
 			const { config } = zipReader;
-			if (!reader.initialized && reader.init) {
-				await reader.init();
-			}
+			await initStream(reader);
 			if (reader.size === undefined || !reader.readUint8Array) {
 				const blob = await new Response(reader.readable).blob();
 				reader = new BlobReader(blob);
@@ -3017,7 +3021,7 @@
 				throw new Error(ERR_BAD_FORMAT);
 			}
 			const filenameEncoding = getOptionValue$1(zipReader, options, "filenameEncoding");
-			const commentEncoding = getOptionValue$1(zipReader, options, "commentEncoding");	
+			const commentEncoding = getOptionValue$1(zipReader, options, "commentEncoding");
 			for (let indexFile = 0; indexFile < filesLength; indexFile++) {
 				const fileEntry = new ZipEntry$1(reader, config, zipReader.options);
 				if (getUint32(directoryView, offset) != CENTRAL_FILE_HEADER_SIGNATURE) {
@@ -3038,7 +3042,7 @@
 					commentLength: getUint16(directoryView, offset + 32),
 					directory: msDosCompatible && ((getUint8(directoryView, offset + 38) & FILE_ATTR_MSDOS_DIR_MASK) == FILE_ATTR_MSDOS_DIR_MASK),
 					offset: getUint32(directoryView, offset + 42) + prependedDataLength,
-					internalFileAttribute: getUint32(directoryView, offset + 34),
+					internalFileAttribute: getUint16(directoryView, offset + 36),
 					externalFileAttribute: getUint32(directoryView, offset + 38),
 					rawFilename: directoryArray.subarray(filenameOffset, extraFieldOffset),
 					filenameUTF8: languageEncodingFlag,
@@ -3155,9 +3159,7 @@
 			readable.size = size;
 			const { writable } = writer;
 			const signal = getOptionValue$1(zipEntry, options, "signal");
-			if (writer.init && !writer.initialized) {
-				await writer.init();
-			}
+			await initStream(writer);
 			const { onstart, onprogress, onend } = options;
 			const workerOptions = {
 				options: {
@@ -3617,9 +3619,7 @@
 		const internalFileAttribute = getOptionValue(zipWriter, options, "internalFileAttribute") || 0;
 		const externalFileAttribute = getOptionValue(zipWriter, options, "externalFileAttribute") || 0;
 		if (reader) {
-			if (reader.init && !reader.initialized) {
-				await reader.init();
-			}
+			await initStream(reader);
 			if (reader.size === undefined) {
 				options.dataDescriptor = true;
 			} else {
@@ -3716,9 +3716,7 @@
 				bufferedWrite = true;
 			} else {
 				zipWriter.lockWriter = Promise.resolve();
-				if (writer.init && !writer.initialized) {
-					await writer.init();
-				}
+				await initStream(writer);
 				fileWriter = writer;
 			}
 			fileEntry = await createFileEntry(reader, fileEntry, fileWriter.writable, zipWriter.config, options);
@@ -3744,7 +3742,7 @@
 						setUint32(arrayBufferView, 18, fileEntry.compressedSize);
 						setUint32(arrayBufferView, 22, fileEntry.uncompressedSize);
 					}
-					await writeUint8Array(writable, new Uint8Array(arrayBuffer));
+					await writeData(writable, new Uint8Array(arrayBuffer));
 					blob = blob.slice(headerLength);
 				}
 				await blob.stream().pipeTo(writable, { preventClose: true, signal });
@@ -3864,6 +3862,7 @@
 			rawExtraFieldNTFS = rawExtraFieldExtendedTimestamp = new Uint8Array();
 		}
 		const fileEntry = {
+			lock: pendingFileEntry.lock,
 			version: version || VERSION_DEFLATE,
 			versionMadeBy,
 			zip64,
@@ -3940,7 +3939,7 @@
 		let compressedSize = 0;
 		if (reader) {
 			reader.chunkSize = getChunkSize(config);
-			await writeUint8Array(writable, localHeaderArray);
+			await writeData(writable, localHeaderArray);
 			fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 			const size = () => reader.size;
 			const readable = reader.readable;
@@ -3967,7 +3966,7 @@
 			uncompressedSize = fileEntry.uncompressedSize = reader.size = readable.size();
 			compressedSize = result.size;
 		} else {
-			await writeUint8Array(writable, localHeaderArray);
+			await writeData(writable, localHeaderArray);
 			fileEntry.dataWritten = pendingFileEntry.dataWritten = true;
 		}
 		let dataDescriptorArray = new Uint8Array();
@@ -4011,7 +4010,7 @@
 			}
 		}
 		if (dataDescriptor) {
-			await writeUint8Array(writable, dataDescriptorArray);
+			await writeData(writable, dataDescriptorArray);
 		}
 		const length = localHeaderArray.length + compressedSize + dataDescriptorArray.length;
 		Object.assign(fileEntry, {
@@ -4086,7 +4085,7 @@
 			arraySet(directoryArray, headerArray, offset + 6);
 			setUint16(directoryView, offset + 30, extraFieldLength);
 			setUint16(directoryView, offset + 32, rawComment.length);
-			setUint32(directoryView, offset + 34, internalFileAttribute);
+			setUint16(directoryView, offset + 36, internalFileAttribute);
 			if (externalFileAttribute) {
 				setUint32(directoryView, offset + 38, externalFileAttribute);
 			} else if (directory && msDosCompatible) {
@@ -4143,9 +4142,9 @@
 			}
 		}
 		const { writable } = zipWriter.writer;
-		await writeUint8Array(writable, directoryArray);
+		await writeData(writable, directoryArray);
 		if (comment && comment.length) {
-			await writeUint8Array(writable, comment);
+			await writeData(writable, comment);
 		}
 	}
 
@@ -4157,7 +4156,7 @@
 		}
 	}
 
-	async function writeUint8Array(writable, array) {
+	async function writeData(writable, array) {
 		const streamWriter = writable.getWriter();
 		await streamWriter.ready;
 		await streamWriter.write(array);
@@ -4230,8 +4229,6 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const CHUNK_SIZE = 512 * 1024;
-
 	class ZipEntry {
 
 		constructor(fs, name, params, parent) {
@@ -4304,13 +4301,13 @@
 			if (!writer || (writer.constructor == zipEntry.Writer && zipEntry.data)) {
 				return zipEntry.data;
 			} else {
-				zipEntry.reader = new zipEntry.Reader(zipEntry.data, options);
-				await zipEntry.reader.init();
-				if (writer.init && !writer.initialized) {
-					await writer.init();
-				}
-				zipEntry.uncompressedSize = zipEntry.reader.size;
-				return pipe(zipEntry.reader, writer);
+				const reader = zipEntry.reader = new zipEntry.Reader(zipEntry.data, options);
+				await Promise.all([initStream(reader), initStream(writer)]);
+				zipEntry.uncompressedSize = reader.size;
+				const readable = reader.readable;
+				readable.size = () => reader.size;
+				await readable.pipeTo(writer.writable);
+				return writer.getData ? writer.getData() : writer.writable;
 			}
 		}
 
@@ -4330,6 +4327,10 @@
 			return this.getData(new Uint8ArrayWriter(), options);
 		}
 
+		getWritable(writable = new WritableStream(), options) {
+			return this.getData({ writable }, options);
+		}
+
 		replaceBlob(blob) {
 			Object.assign(this, {
 				data: blob,
@@ -4365,6 +4366,15 @@
 				reader: null
 			});
 		}
+
+		replaceReadable(readable) {
+			Object.assign(this, {
+				data: null,
+				Reader: function () { return { readable }; },
+				Writer: null,
+				reader: null
+			});
+		}
 	}
 
 	class ZipDirectoryEntry extends ZipEntry {
@@ -4421,6 +4431,12 @@
 			});
 		}
 
+		addReadable(name, readable) {
+			return addChild(this, name, {
+				Reader: function () { return { readable }; }
+			});
+		}
+
 		addFileSystemEntry(fileSystemEntry) {
 			return addFileSystemEntry(this, fileSystemEntry);
 		}
@@ -4445,6 +4461,10 @@
 			await this.importZip(new HttpReader(url, options), options);
 		}
 
+		async importReadable(readable, options = {}) {
+			await this.importZip({ readable }, options);
+		}
+
 		exportBlob(options = {}) {
 			return this.exportZip(new BlobWriter("application/zip"), options);
 		}
@@ -4457,10 +4477,13 @@
 			return this.exportZip(new Uint8ArrayWriter(), options);
 		}
 
+		async exportWritable(writable = new WritableStream(), options = {}) {
+			await this.exportZip({ writable }, options);
+			return writable;
+		}
+
 		async importZip(reader, options) {
-			if (!reader.initialized) {
-				await reader.init();
-			}
+			await initStream(reader);
 			const zipReader = new ZipReader(reader, options);
 			const entries = await zipReader.getEntries();
 			entries.forEach((entry) => {
@@ -4479,12 +4502,11 @@
 
 		async exportZip(writer, options) {
 			const zipEntry = this;
-			await initReaders(zipEntry);
-			await writer.init();
+			await Promise.all([initReaders(zipEntry), initStream(writer)]);
 			const zipWriter = new ZipWriter(writer, options);
 			await exportZip(zipWriter, zipEntry, getTotalSize([zipEntry], "uncompressedSize"), options);
 			await zipWriter.close();
-			return writer.getData();
+			return writer.getData ? writer.getData() : writer.writable;
 		}
 
 		getChildByName(name) {
@@ -4574,6 +4596,10 @@
 			return this.root.addHttpContent(name, url, options);
 		}
 
+		addReadable(name, readable) {
+			return this.root.addReadable(name, readable);
+		}
+
 		addFileSystemEntry(fileSystemEntry) {
 			return this.root.addFileSystemEntry(fileSystemEntry);
 		}
@@ -4597,6 +4623,11 @@
 			await this.root.importHttpContent(url, options);
 		}
 
+		async importReadable(readable, options) {
+			resetFS(this);
+			await this.root.importReadable(readable, options);
+		}
+
 		exportBlob(options) {
 			return this.root.exportBlob(options);
 		}
@@ -4604,6 +4635,14 @@
 		exportData64URI(options) {
 			return this.root.exportData64URI(options);
 		}
+
+		exportUint8Array(options) {
+			return this.root.exportUint8Array(options);
+		}
+
+		exportWritable(writable, options) {
+			return this.root.exportWritable(writable, options);
+		}
 	}
 
 	const fs = { FS, ZipDirectoryEntry, ZipFileEntry };
@@ -4631,6 +4670,7 @@
 			}
 
 			async init() {
+				super.init();
 				const zipBlobReader = this;
 				zipBlobReader.size = zipBlobReader.entry.uncompressedSize;
 				const data = await zipBlobReader.entry.getData(new BlobWriter(), Object.assign({}, zipBlobReader.options, options));
@@ -4650,9 +4690,9 @@
 				if (child.directory) {
 					await initReaders(child);
 				} else {
-					child.reader = new child.Reader(child.data);
-					await child.reader.init();
-					child.uncompressedSize = child.reader.size;
+					const reader = child.reader = new child.Reader(child.data);
+					await initStream(reader);
+					child.uncompressedSize = reader.size;
 				}
 			}
 		}
@@ -4761,21 +4801,6 @@
 		fs.root = new ZipDirectoryEntry(fs);
 	}
 
-	function pipe(reader, writer) {
-		return copyChunk();
-
-		async function copyChunk(chunkIndex = 0) {
-			const index = chunkIndex * CHUNK_SIZE;
-			if (index < reader.size) {
-				const array = await reader.readUint8Array(index, Math.min(CHUNK_SIZE, reader.size - index));
-				await writer.writeUint8Array(array);
-				return copyChunk(chunkIndex + 1);
-			} else {
-				return writer.getData();
-			}
-		}
-	}
-
 	function addChild(parent, name, params, directory) {
 		if (parent.directory) {
 			return directory ? new ZipDirectoryEntry(parent.fs, name, params, parent) : new ZipFileEntry(parent.fs, name, params, parent);
@@ -4861,6 +4886,7 @@
 	exports.fs = fs;
 	exports.getMimeType = getMimeType;
 	exports.initShimAsyncCodec = streamCodecShim;
+	exports.initStream = initStream;
 	exports.terminateWorkers = terminateWorkers;
 
 	Object.defineProperty(exports, '__esModule', { value: true });