@zip.js/zip.js 2.6.50 → 2.6.52

package/index.d.ts

@@ -740,9 +740,9 @@ interface ZipReaderOptions {
 }
 
 /**
- * Represents an entry in a zip file (Core API).
+ * Represents the metadata of an entry in a zip file (Core API).
  */
-export interface Entry {
+export interface EntryMetaData {
     /**
      * The byte offset of the entry.
      */
@@ -861,6 +861,20 @@ export interface Entry {
     getData?<Type>(writer: Writer<Type> | WritableWriter | WritableStream | AsyncGenerator<Writer<unknown> | WritableWriter | WritableStream, boolean>, options?: EntryGetDataOptions): Promise<Type>
 }
 
+/**
+ * Represents an entry with its data and metadata in a zip file (Core API).
+ */
+export interface Entry extends EntryMetaData {
+    /**
+     * Returns the content of the entry
+     * 
+     * @param writer The {@link Writer} instance used to write the content of the entry.
+     * @param options The options.
+     * @returns A promise resolving to the type to data associated to `writer`.
+     */
+    getData<Type>(writer: Writer<Type> | WritableWriter | WritableStream | AsyncGenerator<Writer<unknown> | WritableWriter | WritableStream, boolean>, options?: EntryGetDataOptions): Promise<Type>
+}
+
 /**
  * Represents the options passed to {@link Entry#getData} and `{@link ZipFileEntry}.get*`.
  */
@@ -904,9 +918,9 @@ export class ZipWriter<Type> {
      * @param filename The filename of the entry.
      * @param reader The  {@link Reader} instance used to read the content of the entry.
      * @param options The options.
-     * @returns A promise resolving to an {@link Entry} instance.
+     * @returns A promise resolving to an {@link EntryMetaData} instance.
      */
-    add<ReaderType>(filename: string, reader?: Reader<ReaderType> | ReadableReader | ReadableStream | Reader<unknown>[] | ReadableReader[] | ReadableStream[], options?: ZipWriterAddDataOptions): Promise<Entry>
+    add<ReaderType>(filename: string, reader?: Reader<ReaderType> | ReadableReader | ReadableStream | Reader<unknown>[] | ReadableReader[] | ReadableStream[], options?: ZipWriterAddDataOptions): Promise<EntryMetaData>
     /**
      * Writes the entries directory, writes the global comment, and returns the content of the zip file
      * 
@@ -1075,7 +1089,7 @@ interface ZipWriterConstructorOptions {
      */
     dataDescriptorSignature?: boolean
     /**
-     * `true` to write {@link Entry#externalFileAttribute} in MS-DOS format for folder entries.
+     * `true` to write {@link EntryMetaData#externalFileAttribute} in MS-DOS format for folder entries.
      * 
      * @defaultValue true
      */
@@ -1134,7 +1148,7 @@ interface EntryOnprogressOptions {
      * @param entry The entry being read/written.
      * @returns An empty promise or `undefined`.
      */
-    onprogress?(progress: number, total: number, entry: Entry): Promise<void> | undefined
+    onprogress?(progress: number, total: number, entry: EntryMetaData): Promise<void> | undefined
 }
 
 /**
@@ -1146,9 +1160,9 @@ declare class ZipEntry {
      */
     name: string
     /**
-     * The underlying {@link Entry} instance.
+     * The underlying {@link EntryMetaData} instance.
      */
-    data?: Entry
+    data?: EntryMetaData
     /**
      * The ID of the instance.
      */

package/lib/core/io.js

@@ -585,7 +585,7 @@ class SplitDataWriter extends Stream {
 		let diskSourceWriter, diskWritable, diskWriter;
 		const writable = new WritableStream({
 			async write(chunk) {
-				let { maxSize } = zipWriter;
+				const { availableSize } = zipWriter;
 				if (!diskWriter) {
 					const { value, done } = await writerGenerator.next();
 					if (done && !value) {
@@ -596,24 +596,21 @@ class SplitDataWriter extends Stream {
 						if (diskSourceWriter.maxSize) {
 							zipWriter.maxSize = diskSourceWriter.maxSize;
 						}
+						zipWriter.availableSize = zipWriter.maxSize;
 						await initStream(diskSourceWriter);
 						diskWritable = value.writable;
 						diskWriter = diskWritable.getWriter();
 					}
 					await this.write(chunk);
-				} else if (diskSourceWriter.size + chunk.length >= maxSize) {
-					const chunkLength = maxSize - diskSourceWriter.size;
-					await writeChunk(chunk.slice(0, chunkLength));
+				} else if (chunk.length >= availableSize) {
+					await writeChunk(chunk.slice(0, availableSize));
 					await closeDisk();
 					zipWriter.diskOffset += diskSourceWriter.size;
 					zipWriter.diskNumber++;
 					diskWriter = null;
-					await this.write(chunk.slice(chunkLength));
+					await this.write(chunk.slice(availableSize));
 				} else {
-					if (chunk.length) {
-						await writeChunk(chunk);
-					}
-					zipWriter.availableSize = maxSize - diskSourceWriter.size;
+					await writeChunk(chunk);
 				}
 			},
 			async close() {
@@ -628,10 +625,14 @@ class SplitDataWriter extends Stream {
 		});
 
 		async function writeChunk(chunk) {
-			await diskWriter.ready;
-			await diskWriter.write(chunk);
-			diskSourceWriter.size += chunk.length;
-			zipWriter.size += chunk.length;
+			const chunkLength = chunk.length;
+			if (chunkLength) {
+				await diskWriter.ready;
+				await diskWriter.write(chunk);
+				diskSourceWriter.size += chunkLength;
+				zipWriter.size += chunkLength;
+				zipWriter.availableSize -= chunkLength;
+			}
 		}
 
 		async function closeDisk() {

package/lib/core/zip-writer.js

@@ -332,6 +332,9 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		dataDescriptor,
 		signal
 	} = options;
+	const {
+		headerInfo
+	} = entryInfo;
 	const previousFileEntry = Array.from(files.values()).pop();
 	let fileEntry = {};
 	let bufferedWrite;
@@ -357,7 +360,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			initLockWriter();
 		}
 		await initStream(fileWriter);
-		const { writable, diskNumber } = writer;
+		const { writable } = writer;
 		let { diskOffset } = writer;
 		if (zipWriter.addSplitZipSignature) {
 			delete zipWriter.addSplitZipSignature;
@@ -369,7 +372,9 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		}
 		if (!bufferedWrite) {
 			await lockPreviousFileEntry;
+			await skipDiskIfNeeded(writable);
 		}
+		const { diskNumber } = writer;
 		writingEntryData = true;
 		fileEntry.diskNumberStart = diskNumber;
 		fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, zipWriter.config, options);
@@ -385,6 +390,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			if (!dataDescriptor) {
 				blob = await writeMissingHeaderInfo(fileEntry, blob, writable, options);
 			}
+			await skipDiskIfNeeded(writable);
 			fileEntry.diskNumberStart = writer.diskNumber;
 			diskOffset = writer.diskOffset;
 			await blob.stream().pipeTo(writable, { preventClose: true, signal });
@@ -440,6 +446,13 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			zipWriter.lockWriter = new Promise(resolve => releaseLockWriter = resolve);
 		}
 	}
+
+	async function skipDiskIfNeeded(writable) {
+		if (headerInfo.localHeaderArray.length > writer.availableSize) {
+			writer.availableSize = 0;
+			await writeData(writable, new Uint8Array());
+		}
+	}
 }
 
 async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryInfo, config, options) {
@@ -827,6 +840,8 @@ async function closeFile(zipWriter, comment, options) {
 	}
 	const directoryArray = new Uint8Array(directoryDataLength);
 	const directoryView = getDataView(directoryArray);
+	await initStream(writer);
+	let directoryDiskOffset = 0;
 	for (const [indexFileEntry, fileEntry] of Array.from(files.values()).entries()) {
 		const {
 			offset: fileEntryOffset,
@@ -879,7 +894,13 @@ async function closeFile(zipWriter, comment, options) {
 		arraySet(directoryArray, rawExtraFieldNTFS, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp));
 		arraySet(directoryArray, rawExtraField, offset + 46 + getLength(rawFilename, rawExtraFieldZip64, rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS));
 		arraySet(directoryArray, rawComment, offset + 46 + getLength(rawFilename) + extraFieldLength);
-		offset += 46 + getLength(rawFilename, rawComment) + extraFieldLength;
+		const directoryEntryLength = 46 + getLength(rawFilename, rawComment) + extraFieldLength;
+		if (offset - directoryDiskOffset > writer.availableSize) {
+			writer.availableSize = 0;
+			await writeData(writable, directoryArray.slice(directoryDiskOffset, offset));
+			directoryDiskOffset = offset;
+		}
+		offset += directoryEntryLength;
 		if (options.onprogress) {
 			try {
 				await options.onprogress(indexFileEntry + 1, files.size, new Entry(fileEntry));
@@ -888,8 +909,7 @@ async function closeFile(zipWriter, comment, options) {
 			}
 		}
 	}
-	await initStream(writer);
-	await writeData(writable, directoryArray);
+	await writeData(writable, directoryDiskOffset ? directoryArray.slice(directoryDiskOffset) : directoryArray);
 	let lastDiskNumber = writer.diskNumber;
 	const { availableSize } = writer;
 	if (availableSize < END_OF_CENTRAL_DIR_LENGTH) {

package/package.json

@@ -3,7 +3,7 @@
     "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
     "author": "Gildas Lormeau",
     "license": "BSD-3-Clause",
-    "version": "2.6.50",
+    "version": "2.6.52",
     "type": "module",
     "keywords": [
         "zip",