@zip.js/zip.js 2.6.5 → 2.6.8

package/dist/zip-full.js

@@ -6939,6 +6939,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.
 
@@ -7183,9 +7189,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);
@@ -7251,7 +7255,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(reader, config, zipReader.options);
 				if (getUint32(directoryView, offset) != CENTRAL_FILE_HEADER_SIGNATURE) {
@@ -7272,7 +7276,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,
@@ -7389,9 +7393,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: {
@@ -7851,9 +7853,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 {
@@ -7950,9 +7950,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);
@@ -7978,7 +7976,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 });
@@ -8098,6 +8096,7 @@
 			rawExtraFieldNTFS = rawExtraFieldExtendedTimestamp = new Uint8Array();
 		}
 		const fileEntry = {
+			lock: pendingFileEntry.lock,
 			version: version || VERSION_DEFLATE,
 			versionMadeBy,
 			zip64,
@@ -8174,7 +8173,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;
@@ -8201,7 +8200,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();
@@ -8245,7 +8244,7 @@
 			}
 		}
 		if (dataDescriptor) {
-			await writeUint8Array(writable, dataDescriptorArray);
+			await writeData(writable, dataDescriptorArray);
 		}
 		const length = localHeaderArray.length + compressedSize + dataDescriptorArray.length;
 		Object.assign(fileEntry, {
@@ -8320,7 +8319,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) {
@@ -8377,9 +8376,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);
 		}
 	}
 
@@ -8391,7 +8390,7 @@
 		}
 	}
 
-	async function writeUint8Array(writable, array) {
+	async function writeData(writable, array) {
 		const streamWriter = writable.getWriter();
 		await streamWriter.ready;
 		await streamWriter.write(array);
@@ -8512,6 +8511,7 @@
 	exports.configure = configure;
 	exports.getMimeType = getMimeType;
 	exports.initShimAsyncCodec = streamCodecShim;
+	exports.initStream = initStream;
 	exports.terminateWorkers = terminateWorkers;
 
 	Object.defineProperty(exports, '__esModule', { value: true });