@zip.js/zip.js 2.6.16 → 2.6.19

package/lib/core/codec-interface.js

@@ -27,6 +27,7 @@
  */
 
 // deno-lint-ignore-file no-this-alias
+/* global TransformStream */
 
 import {
 	InflateStream,
@@ -68,7 +69,17 @@ class Codec {
 
 		async function run(StreamConstructor) {
 			const stream = new StreamConstructor(codecConstructor, options, config);
-			await readable.pipeThrough(stream).pipeTo(writable, { preventClose: true });
+			await readable
+				.pipeThrough(stream)
+				.pipeThrough(new TransformStream({
+					transform(chunk, controller) {
+						if (chunk && chunk.length) {
+							writable.size += chunk.length;
+							controller.enqueue(chunk);
+						}
+					}
+				}))
+				.pipeTo(writable, { preventClose: true, preventAbort: true });
 			const { size, signature } = stream;
 			return { size, signature };
 		}

package/lib/core/codec-pool-worker.js

@@ -208,6 +208,7 @@ function createWebWorkerInterface(workerData, { baseURL, chunkSize }) {
 				}
 				if (type == MESSAGE_DATA) {
 					await writer.ready;
+					workerData.writable.size += data.byteLength;
 					await writer.write(new Uint8Array(data));
 				}
 				if (type == MESSAGE_CLOSE) {

package/lib/core/io.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream, FileReader */
+/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream, FileReader, TransformStream, Response */
 
 const ERR_HTTP_STATUS = "HTTP error ";
 const ERR_HTTP_RANGE = "HTTP Range not supported";
@@ -78,7 +78,7 @@ class Reader extends Stream {
 	}
 }
 
-class WriterStream extends Stream {
+class Writer extends Stream {
 
 	constructor() {
 		super();
@@ -88,18 +88,15 @@ class WriterStream extends Stream {
 				return writer.writeUint8Array(chunk);
 			}
 		});
-		Object.defineProperty(this, "writable", {
+		Object.defineProperty(writer, "writable", {
 			get() {
 				return writable;
 			}
 		});
 	}
-}
-
-class Writer extends WriterStream {
 
-	writeUint8Array(array) {
-		this.size += array.length;
+	writeUint8Array() {
+		// abstract
 	}
 }
 
@@ -131,7 +128,6 @@ class TextWriter extends Writer {
 	}
 
 	writeUint8Array(array) {
-		super.writeUint8Array(array);
 		this.blob = new Blob([this.blob, array.buffer], { type: CONTENT_TYPE_TEXT_PLAIN });
 	}
 
@@ -186,7 +182,6 @@ class Data64URIWriter extends Writer {
 	}
 
 	writeUint8Array(array) {
-		super.writeUint8Array(array);
 		const writer = this;
 		let indexArray = 0;
 		let dataString = writer.pending;
@@ -224,48 +219,35 @@ class BlobReader extends Reader {
 	}
 }
 
-class BlobWriter extends Writer {
+class BlobWriter extends Stream {
 
 	constructor(contentType) {
 		super();
 		const writer = this;
 		writer.contentType = contentType;
-		writer.arrayBuffersMaxlength = 8;
-		initArrayBuffers(writer);
+		writer.transformStream = new TransformStream();
+		Object.defineProperty(this, "writable", {
+			get() {
+				return writer.transformStream.writable;
+			}
+		});
 	}
 
-	writeUint8Array(array) {
-		super.writeUint8Array(array);
+	init() {
+		super.init();
 		const writer = this;
-		if (writer.arrayBuffers.length == writer.arrayBuffersMaxlength) {
-			flushArrayBuffers(writer);
-		}
-		writer.arrayBuffers.push(array.buffer);
+		const {
+			transformStream,
+			contentType
+		} = writer;
+		writer.blob = new Response(transformStream.readable).blob({ type: contentType });
 	}
 
 	getData() {
-		const writer = this;
-		if (!writer.blob) {
-			if (writer.arrayBuffers.length) {
-				flushArrayBuffers(writer);
-			}
-			writer.blob = writer.pendingBlob;
-			initArrayBuffers(writer);
-		}
-		return writer.blob;
+		return this.blob;
 	}
 }
 
-function initArrayBuffers(blobWriter) {
-	blobWriter.pendingBlob = new Blob([], { type: blobWriter.contentType });
-	blobWriter.arrayBuffers = [];
-}
-
-function flushArrayBuffers(blobWriter) {
-	blobWriter.pendingBlob = new Blob([blobWriter.pendingBlob, ...blobWriter.arrayBuffers], { type: blobWriter.contentType });
-	blobWriter.arrayBuffers = [];
-}
-
 class FetchReader extends Reader {
 
 	constructor(url, options) {
@@ -495,18 +477,21 @@ class Uint8ArrayReader extends Reader {
 class Uint8ArrayWriter extends Writer {
 
 	init(initSize = 0) {
-		this.array = new Uint8Array(initSize);
+		super.init();
+		const writer = this;
+		writer.offset = 0;
+		writer.array = new Uint8Array(initSize);
 	}
 
 	writeUint8Array(array) {
 		const writer = this;
-		if (writer.size + array.length > writer.array.length) {
+		if (writer.offset + array.length > writer.array.length) {
 			const previousArray = writer.array;
 			writer.array = new Uint8Array(previousArray.length + array.length);
 			writer.array.set(previousArray);
 		}
-		writer.array.set(array, writer.size);
-		super.writeUint8Array(array);
+		writer.array.set(array, writer.offset);
+		writer.offset += array.length;
 	}
 
 	getData() {

package/lib/core/streams/zip-entry-stream.js

@@ -167,15 +167,7 @@ function filterEmptyChunks(readable) {
 }
 
 function setReadable(stream, readable, flush) {
-	stream.size = 0;
-	readable = readable.pipeThrough(new TransformStream({
-		transform(chunk, controller) {
-			if (chunk && chunk.length) {
-				stream.size += chunk.length;
-				controller.enqueue(chunk);
-			}
-		}, flush
-	}));
+	readable = readable.pipeThrough(new TransformStream({ flush }));
 	Object.defineProperty(stream, "readable", {
 		get() {
 			return readable;

package/lib/core/zip-fs-core.js

@@ -437,6 +437,11 @@ class FS {
 		await this.root.importData64URI(dataURI, options);
 	}
 
+	async importUint8Array(array, options) {
+		resetFS(this);
+		await this.root.importUint8Array(array, options);
+	}
+
 	async importHttpContent(url, options) {
 		resetFS(this);
 		await this.root.importHttpContent(url, options);

package/lib/core/zip-reader.js

@@ -344,7 +344,8 @@ class ZipEntry {
 			codecConstructor: config.Inflate
 		};
 		await runWorker({ readable, writable }, workerOptions);
-		if (!writer.preventClose) {
+		const preventClose = getOptionValue(zipEntry, options, "preventClose");
+		if (!preventClose) {
 			await writable.getWriter().close();
 		}
 		return writer.getData ? writer.getData() : writable;

package/lib/core/zip-writer.js

@@ -93,13 +93,16 @@ const pendingEntries = [];
 class ZipWriter {
 
 	constructor(writer, options = {}) {
+		if (writer.writable.size == undefined) {
+			writer.writable.size = 0;
+		}
 		Object.assign(this, {
 			writer,
 			options,
 			config: getConfiguration(),
 			files: new Map(),
 			filenames: new Set(),
-			offset: writer.size || 0,
+			offset: writer.writable.size,
 			pendingCompressedSize: 0,
 			pendingAddFileCalls: new Set()
 		});
@@ -321,7 +324,6 @@ async function getFileEntry(zipWriter, name, reader, options) {
 	let releaseLockCurrentFileEntry;
 	let writingBufferedData;
 	let fileWriter;
-	let fileWriterSize;
 	files.set(name, fileEntry);
 	try {
 		let lockPreviousFileEntry;
@@ -331,26 +333,30 @@ async function getFileEntry(zipWriter, name, reader, options) {
 		}
 		if (options.bufferedWrite || zipWriter.lockWriter || !dataDescriptor) {
 			fileWriter = new BlobWriter();
-			fileWriter.init();
+			fileWriter.writable.size = 0;
 			bufferedWrite = true;
-		} else {
-			zipWriter.lockWriter = Promise.resolve();
 			await initStream(writer);
+		} else {
 			fileWriter = writer;
+			zipWriter.lockWriter = Promise.resolve();
+			releaseLockWriter = () => delete zipWriter.lockWriter;
 		}
-		fileWriterSize = fileWriter.size;
-		fileEntry = await createFileEntry(reader, fileEntry, fileWriter.writable, zipWriter.config, options);
+		await initStream(fileWriter);
+		if (!bufferedWrite) {
+			await lockPreviousFileEntry;
+		}
+		fileEntry = await createFileEntry(reader, fileWriter, fileEntry, zipWriter.config, options);
 		files.set(name, fileEntry);
 		fileEntry.filename = name;
 		if (bufferedWrite) {
-			let blob = fileWriter.getData();
+			await fileWriter.writable.getWriter().close();
+			let blob = await fileWriter.getData();
 			await lockPreviousFileEntry;
 			await requestLockWriter();
 			writingBufferedData = true;
 			const { writable } = writer;
 			if (!dataDescriptor) {
-				const headerLength = 26;
-				const arrayBuffer = await sliceAsArrayBuffer(blob, 0, headerLength);
+				const arrayBuffer = await sliceAsArrayBuffer(blob, 0, 26);
 				const arrayBufferView = new DataView(arrayBuffer);
 				if (!fileEntry.encrypted || zipCrypto) {
 					setUint32(arrayBufferView, 14, fileEntry.signature);
@@ -363,7 +369,7 @@ async function getFileEntry(zipWriter, name, reader, options) {
 					setUint32(arrayBufferView, 22, fileEntry.uncompressedSize);
 				}
 				await writeData(writable, new Uint8Array(arrayBuffer));
-				blob = blob.slice(headerLength);
+				blob = blob.slice(arrayBuffer.byteLength);
 			}
 			await blob.stream().pipeTo(writable, { preventClose: true, signal });
 			writingBufferedData = false;
@@ -383,7 +389,11 @@ async function getFileEntry(zipWriter, name, reader, options) {
 			if (error) {
 				error.corruptedEntry = true;
 			}
-			zipWriter.offset += fileWriter.size - fileWriterSize;
+			if (bufferedWrite) {
+				zipWriter.offset += fileWriter.writable.size;
+			} else {
+				zipWriter.offset = fileWriter.writable.size;
+			}
 		}
 		files.delete(name);
 		throw error;
@@ -411,7 +421,7 @@ async function getFileEntry(zipWriter, name, reader, options) {
 	}
 }
 
-async function createFileEntry(reader, pendingFileEntry, writable, config, options) {
+async function createFileEntry(reader, writer, pendingFileEntry, config, options) {
 	const {
 		rawFilename,
 		lastAccessDate,
@@ -504,7 +514,7 @@ async function createFileEntry(reader, pendingFileEntry, writable, config, optio
 		internalFileAttribute,
 		externalFileAttribute
 	};
-	let uncompressedSize = fileEntry.uncompressedSize = 0;
+	let uncompressedSize = 0;
 	let bitFlag = BITFLAG_LANG_ENCODING_FLAG;
 	if (dataDescriptor) {
 		bitFlag = bitFlag | BITFLAG_DATA_DESCRIPTOR;
@@ -560,6 +570,7 @@ async function createFileEntry(reader, pendingFileEntry, writable, config, optio
 	arraySet(localHeaderArray, rawExtraField, 30 + rawFilename.length + rawExtraFieldAES.length + rawExtraFieldExtendedTimestamp.length + rawExtraFieldNTFS.length);
 	let result;
 	let compressedSize = 0;
+	const { writable } = writer;
 	fileEntry.writingData = pendingFileEntry.writingData = true;
 	if (reader) {
 		reader.chunkSize = getChunkSize(config);
@@ -585,9 +596,10 @@ async function createFileEntry(reader, pendingFileEntry, writable, config, optio
 			streamOptions: { signal, size, onstart, onprogress, onend },
 			codecConstructor: config.Deflate
 		};
+		const previousSize = writable.size;
 		result = await runWorker({ readable, writable }, workerOptions);
-		uncompressedSize = fileEntry.uncompressedSize = reader.size = readable.size();
-		compressedSize = result.size;
+		uncompressedSize = reader.size = readable.size();
+		compressedSize = writable.size - previousSize;
 	} else {
 		await writeData(writable, localHeaderArray);
 	}
@@ -765,6 +777,7 @@ async function closeFile(zipWriter, comment, options) {
 		}
 	}
 	const { writable } = zipWriter.writer;
+	await initStream(zipWriter.writer);
 	await writeData(writable, directoryArray);
 	if (comment && comment.length) {
 		await writeData(writable, comment);
@@ -782,6 +795,7 @@ function sliceAsArrayBuffer(blob, start, end) {
 async function writeData(writable, array) {
 	const streamWriter = writable.getWriter();
 	await streamWriter.ready;
+	writable.size += array.length;
 	await streamWriter.write(array);
 	streamWriter.releaseLock();
 }