@zip.js/zip.js 2.8.53 → 2.8.54

package/lib/core/zip-writer.js

@@ -53,10 +53,10 @@
  *
  * Scheduling:
  * - The central directory order (i.e. the order in which entries are listed by getEntries()) is
- *   the insertion order of the `files` map. addFile() reserves each entry's slot synchronously in
+ *   the insertion order of the `fileEntries` map. addFile() reserves each entry's slot synchronously in
  *   add() call order, before initializing the reader, so concurrent entries whose readers
  *   initialize at different speeds are still listed in call order.
- * - `fileEntry.lock` chains every entry to the previous one to reach getFileEntry(); awaiting it
+ * - `fileEntry.lockFileEntry` chains every entry to the previous one to reach getFileEntry(); awaiting it
  *   serializes the physical writes when `keepOrder` is set. The physical layout therefore follows
  *   the order in which the readers finish initializing, not necessarily the central directory
  *   order; each entry records its own `offset`, so the archive stays consistent either way.
@@ -86,6 +86,7 @@ import {
 	COMPRESSION_METHOD_STORE,
 	COMPRESSION_METHOD_AES,
 	SPLIT_ZIP_FILE_SIGNATURE,
+	SPLIT_ZIP_FILE_SIGNATURE_LENGTH,
 	LOCAL_FILE_HEADER_SIGNATURE,
 	DATA_DESCRIPTOR_RECORD_SIGNATURE,
 	DIGITAL_SIGNATURE_RECORD_SIGNATURE,
@@ -139,6 +140,8 @@ import {
 	HEADER_OFFSET_SIGNATURE,
 	HEADER_OFFSET_COMPRESSED_SIZE,
 	HEADER_OFFSET_UNCOMPRESSED_SIZE,
+	HEADER_OFFSET_FILENAME_LENGTH,
+	HEADER_OFFSET_EXTRAFIELD_LENGTH,
 	LOCAL_HEADER_COMMON_OFFSET,
 	MIN_DATE,
 	MAX_DATE,
@@ -146,6 +149,7 @@ import {
 	INFINITY_VALUE,
 	OBJECT_TYPE,
 	STRING_TYPE,
+	FUNCTION_TYPE,
 	EMPTY_UINT8_ARRAY
 } from "./constants.js";
 import { getConfiguration } from "./configuration.js";
@@ -158,6 +162,8 @@ import {
 } from "./codec-pool.js";
 import {
 	initStream,
+	createReadable,
+	readUint8Array,
 	GenericWriter,
 	GenericReader,
 	BlobReader,
@@ -224,19 +230,28 @@ import {
 	OPTION_LOCAL_EXTRA_FIELD,
 	OPTION_SIGN_CENTRAL_DIRECTORY,
 	TEXT_TYPE_FILENAME,
-	TEXT_TYPE_COMMENT
+	TEXT_TYPE_COMMENT,
+	ERR_INVALID_PASSWORD_TYPE,
+	checkFunctionOption,
+	checkSignalOption,
+	checkPasswordOption,
+	toNumber
 } from "./options.js";
 
 const ERR_DUPLICATED_NAME = "File already exists";
 const ERR_INVALID_COMMENT = "Zip file comment exceeds 64KB";
 const ERR_INVALID_COMMENT_TYPE = "Invalid zip file comment (must be a Uint8Array)";
 const ERR_INVALID_ENTRY_COMMENT = "File entry comment exceeds 64KB";
+const ERR_INVALID_ENTRY_COMMENT_TYPE = "Invalid file entry comment (must be a string)";
+const ERR_INVALID_DATE = "Invalid date (must be a valid Date instance)";
 const ERR_INVALID_ENTRY_NAME = "File entry name exceeds 64KB";
 const ERR_INVALID_VERSION = "Version exceeds 65535";
 const ERR_INVALID_ENCRYPTION_STRENGTH = "The strength must equal 1, 2, or 3";
 const ERR_UNSUPPORTED_ENCRYPTION_USDZ = "Encryption is not supported in USDZ files";
 const ERR_UNSUPPORTED_ENCRYPTION_PASS_THROUGH = "Encryption is not supported when the 'passThrough' option is set";
-const ERR_INVALID_EXTRAFIELD_TYPE = "Extra field type exceeds 65535";
+const ERR_INVALID_EXTRAFIELD = "Invalid extra field (must be a Map)";
+const ERR_INVALID_EXTRAFIELD_TYPE = "Invalid extra field type (must be integer 0..65535)";
+const ERR_INVALID_EXTRAFIELD_DATA_TYPE = "Invalid extra field data (must be a Uint8Array)";
 const ERR_INVALID_EXTRAFIELD_DATA = "Extra field data exceeds 64KB";
 const ERR_UNSUPPORTED_COMPRESSION = "Compression method not supported";
 const MIN_UNIX_TIME = -2147483648;
@@ -256,7 +271,6 @@ const ERR_INVALID_UNIX_ID_SIZE = "uid/gid must be 0..65535 for unixExtraFieldTyp
 const ERR_INVALID_MSDOS_ATTRIBUTES = "Invalid msdosAttributesRaw (must be integer 0..255)";
 const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
 const ERR_INVALID_LEVEL = "Invalid level (must be integer 0..9)";
-const ERR_INVALID_PASSWORD_TYPE = "Invalid password (password must be a string, rawPassword must be a Uint8Array)";
 const ERR_INVALID_SIGNATURE_DATA = "Signature data exceeds 64KB";
 
 const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
@@ -281,8 +295,7 @@ class ZipWriter {
 			writer,
 			addSplitZipSignature,
 			options,
-			config: getConfiguration(),
-			files: new Map(),
+			fileEntries: new Map(),
 			filenames: new Set(),
 			offset: options[OPTION_OFFSET] === UNDEFINED_VALUE ? writer.size || writer.writable.size || 0 : options[OPTION_OFFSET],
 			initialOffset: options[OPTION_OFFSET] === UNDEFINED_VALUE ? 0 : options[OPTION_OFFSET] - (writer.size || writer.writable.size || 0),
@@ -303,14 +316,23 @@ class ZipWriter {
 			await initStream(reader);
 		}
 		const { ZipReader } = await import("./zip-reader.js");
-		const zipReader = new ZipReader(reader.readable);
+		const zipReader = new ZipReader(reader);
 		const entries = await zipReader.getEntries();
 		await zipReader.close();
 		await initStream(this.writer);
-		await reader.readable.pipeTo(this.writer.writable, { preventClose: true, preventAbort: true });
-		this.writer.size = this.offset = reader.size;
+		const { directoryOffset } = zipReader;
+		let splitZipSignatureLength = 0;
+		if (this.addSplitZipSignature) {
+			delete this.addSplitZipSignature;
+			if (!await startsWithSplitZipSignature(reader)) {
+				await writeData(this.writer, getSplitZipSignatureArray());
+				splitZipSignatureLength = SPLIT_ZIP_FILE_SIGNATURE_LENGTH;
+				this.offset += splitZipSignatureLength;
+			}
+		}
+		const entryPositions = await copyZipData(this, reader, entries, directoryOffset, splitZipSignatureLength);
 		this.filenames = new Set(entries.map(entry => entry.filename));
-		this.files = new Map(entries.map(entry => {
+		this.fileEntries = new Map(entries.map(entry => {
 			const {
 				version,
 				rawLastModDate,
@@ -365,11 +387,12 @@ class ZipWriter {
 			if (crc32 !== UNDEFINED_VALUE) {
 				setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 			}
+			const { offset, diskNumberStart } = entryPositions.get(entry);
 			Object.assign(entry, {
 				zip64UncompressedSize,
 				zip64CompressedSize,
-				zip64Offset: zip64 && entry.offset >= MAX_32_BITS,
-				diskNumberStart: 0,
+				offset,
+				diskNumberStart,
 				zip64DiskNumberStart: false,
 				rawExtraFieldZip64,
 				rawExtraFieldAES,
@@ -389,11 +412,8 @@ class ZipWriter {
 	async add(name = "", reader, options = {}) {
 		const zipWriter = this;
 		options = Object.assign({}, options);
-		const {
-			pendingAddFileCalls,
-			config
-		} = zipWriter;
-		if (workers < config.maxWorkers) {
+		const { pendingAddFileCalls } = zipWriter;
+		if (workers < getConfiguration().maxWorkers) {
 			workers++;
 		} else {
 			await new Promise(resolve => pendingEntries.push(resolve));
@@ -430,16 +450,16 @@ class ZipWriter {
 	}
 
 	remove(entry) {
-		const { filenames, files } = this;
+		const { filenames, fileEntries } = this;
 		// deno-lint-ignore valid-typeof
 		if (typeof entry == STRING_TYPE) {
-			entry = files.get(entry);
+			entry = fileEntries.get(entry);
 		}
 		if (entry && entry.filename !== UNDEFINED_VALUE) {
 			const { filename } = entry;
-			if (filenames.has(filename) && files.has(filename)) {
+			if (filenames.has(filename) && fileEntries.has(filename)) {
 				filenames.delete(filename);
-				files.delete(filename);
+				fileEntries.delete(filename);
 				return true;
 			}
 		}
@@ -539,8 +559,12 @@ export {
 	ERR_INVALID_COMMENT_TYPE,
 	ERR_INVALID_ENTRY_NAME,
 	ERR_INVALID_ENTRY_COMMENT,
+	ERR_INVALID_ENTRY_COMMENT_TYPE,
+	ERR_INVALID_DATE,
 	ERR_INVALID_VERSION,
+	ERR_INVALID_EXTRAFIELD,
 	ERR_INVALID_EXTRAFIELD_TYPE,
+	ERR_INVALID_EXTRAFIELD_DATA_TYPE,
 	ERR_INVALID_EXTRAFIELD_DATA,
 	ERR_INVALID_ENCRYPTION_STRENGTH,
 	ERR_UNSUPPORTED_ENCRYPTION_USDZ,
@@ -569,12 +593,12 @@ async function addFile(zipWriter, name, reader, options) {
 	const metadataInfo = resolveMetadata(zipWriter, name, options);
 	const { comment } = metadataInfo;
 	const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
-	zipWriter.files.set(name, UNDEFINED_VALUE);
+	zipWriter.fileEntries.set(name, UNDEFINED_VALUE);
 	let fileEntry;
 	try {
 		const { resolvedOptions } = metadataInfo;
 		if (resolvedOptions.level != 0 && resolvedOptions.compressionMethod === UNDEFINED_VALUE &&
-			!resolvedOptions.passThrough && !(await supportsDeflate(zipWriter.config))) {
+			!resolvedOptions.passThrough && !(await supportsDeflate(getConfiguration()))) {
 			resolvedOptions.level = 0;
 		}
 		const sizesInfo = await resolveSizes(zipWriter, reader, metadataInfo, options);
@@ -592,7 +616,7 @@ async function addFile(zipWriter, name, reader, options) {
 		const metadataSize = getLength(headerInfo.localHeaderArray, dataDescriptorInfo.dataDescriptorArray);
 		fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo, metadataSize }, options);
 	} catch (error) {
-		zipWriter.files.delete(name);
+		zipWriter.fileEntries.delete(name);
 		throw error;
 	}
 	Object.assign(fileEntry, {
@@ -636,9 +660,9 @@ function resolveAttributes(zipWriter, name, options) {
 	if (unixExtraFieldType === UNDEFINED_VALUE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
 		unixExtraFieldType = INFOZIP_EXTRA_FIELD_TYPE;
 	}
-	let msdosAttributesRaw = getOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW);
+	let msdosAttributesRaw = getNumberOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW);
 	let msdosAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES);
-	const hasUnixMetadata = uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE || unixMode !== UNDEFINED_VALUE || unixExtraFieldType;
+	const hasUnixMetadata = uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE || unixMode !== UNDEFINED_VALUE || unixExtraFieldType || executable;
 	const hasMsDosProvided = msdosAttributesRaw !== UNDEFINED_VALUE || msdosAttributes !== UNDEFINED_VALUE;
 	if (hasUnixMetadata) {
 		msDosCompatible = false;
@@ -647,10 +671,10 @@ function resolveAttributes(zipWriter, name, options) {
 		msDosCompatible = true;
 		versionMadeBy = (versionMadeBy & MAX_8_BITS);
 	}
-	if (msdosAttributesRaw !== UNDEFINED_VALUE && (msdosAttributesRaw < 0 || msdosAttributesRaw > MAX_8_BITS)) {
+	if (msdosAttributesRaw !== UNDEFINED_VALUE && (!Number.isInteger(msdosAttributesRaw) || msdosAttributesRaw < 0 || msdosAttributesRaw > MAX_8_BITS)) {
 		throw new Error(ERR_INVALID_MSDOS_ATTRIBUTES);
 	}
-	if (msdosAttributes && typeof msdosAttributes !== OBJECT_TYPE) {
+	if (msdosAttributes && (typeof msdosAttributes !== OBJECT_TYPE || Array.isArray(msdosAttributes))) {
 		throw new Error(ERR_INVALID_MSDOS_DATA);
 	}
 	if (versionMadeBy > MAX_16_BITS) {
@@ -738,7 +762,7 @@ function resolveAttributes(zipWriter, name, options) {
 }
 
 function resolveMetadata(zipWriter, name, options) {
-	const encode = getOptionValue(zipWriter, options, OPTION_ENCODE_TEXT, encodeText);
+	const encode = getFunctionOptionValue(zipWriter, options, OPTION_ENCODE_TEXT) || encodeText;
 	let rawFilename = encode(name, TEXT_TYPE_FILENAME);
 	if (rawFilename === UNDEFINED_VALUE) {
 		rawFilename = encodeText(name);
@@ -747,6 +771,10 @@ function resolveMetadata(zipWriter, name, options) {
 		throw new Error(ERR_INVALID_ENTRY_NAME);
 	}
 	const comment = options[PROPERTY_NAME_COMMENT] || "";
+	// deno-lint-ignore valid-typeof
+	if (typeof comment != STRING_TYPE) {
+		throw new Error(ERR_INVALID_ENTRY_COMMENT_TYPE);
+	}
 	let rawComment = encode(comment, TEXT_TYPE_COMMENT);
 	if (rawComment === UNDEFINED_VALUE) {
 		rawComment = encodeText(comment);
@@ -758,16 +786,14 @@ function resolveMetadata(zipWriter, name, options) {
 	if (version > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_VERSION);
 	}
-	const lastModDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE, new Date());
-	const lastAccessDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_ACCESS_DATE);
-	const creationDate = getOptionValue(zipWriter, options, PROPERTY_NAME_CREATION_DATE);
+	const lastModDate = getDateOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE, new Date());
+	const lastAccessDate = getDateOptionValue(zipWriter, options, PROPERTY_NAME_LAST_ACCESS_DATE);
+	const creationDate = getDateOptionValue(zipWriter, options, PROPERTY_NAME_CREATION_DATE);
 	const internalFileAttributes = getAliasedOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_DEPRECATED_INTERNAL_FILE_ATTRIBUTES, 0);
 	const passThrough = getOptionValue(zipWriter, options, OPTION_PASS_THROUGH);
 	const password = getOptionValue(zipWriter, options, OPTION_PASSWORD);
 	const rawPassword = getOptionValue(zipWriter, options, OPTION_RAW_PASSWORD);
-	if ((password && typeof password != STRING_TYPE) || (rawPassword && !(rawPassword instanceof Uint8Array))) {
-		throw new Error(ERR_INVALID_PASSWORD_TYPE);
-	}
+	checkPasswordOption(password, rawPassword);
 	const encryptionStrength = getNumberOptionValue(zipWriter, options, OPTION_ENCRYPTION_STRENGTH, 3);
 	const zipCrypto = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIPCRYPTO);
 	const extendedTimestamp = getOptionValue(zipWriter, options, OPTION_EXTENDED_TIMESTAMP, true);
@@ -776,9 +802,9 @@ function resolveMetadata(zipWriter, name, options) {
 	const useWebWorkers = getOptionValue(zipWriter, options, OPTION_USE_WEB_WORKERS);
 	const transferStreams = getOptionValue(zipWriter, options, OPTION_TRANSFER_STREAMS);
 	const bufferedWrite = getOptionValue(zipWriter, options, OPTION_BUFFERED_WRITE);
-	const createTempStream = getOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
+	const createTempStream = getFunctionOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
 	const dataDescriptorSignature = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR_SIGNATURE, true);
-	const signal = getOptionValue(zipWriter, options, OPTION_SIGNAL);
+	const signal = checkSignalOption(getOptionValue(zipWriter, options, OPTION_SIGNAL));
 	const useUnicodeFileNames = getOptionValue(zipWriter, options, OPTION_USE_UNICODE_FILE_NAMES, true);
 	const compressionMethod = getOptionValue(zipWriter, options, PROPERTY_NAME_COMPRESSION_METHOD);
 	const registeredCodec = passThrough || compressionMethod === UNDEFINED_VALUE ? UNDEFINED_VALUE : getRegisteredCodec(compressionMethod);
@@ -858,18 +884,26 @@ function serializeExtraField(extraField) {
 	if (!extraField) {
 		return EMPTY_UINT8_ARRAY;
 	}
+	if (!(extraField instanceof Map)) {
+		throw new Error(ERR_INVALID_EXTRAFIELD);
+	}
 	let extraFieldSize = 0;
 	let offset = 0;
-	extraField.forEach(data => extraFieldSize += 4 + getLength(data));
-	const rawExtraField = new Uint8Array(extraFieldSize);
-	const rawExtraFieldView = getDataView(rawExtraField);
 	extraField.forEach((data, type) => {
-		if (type > MAX_16_BITS) {
+		if (!Number.isInteger(type) || type < 0 || type > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
 		}
+		if (!(data instanceof Uint8Array)) {
+			throw new Error(ERR_INVALID_EXTRAFIELD_DATA_TYPE);
+		}
 		if (getLength(data) > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 		}
+		extraFieldSize += 4 + getLength(data);
+	});
+	const rawExtraField = new Uint8Array(extraFieldSize);
+	const rawExtraFieldView = getDataView(rawExtraField);
+	extraField.forEach((data, type) => {
 		setUint16(rawExtraFieldView, offset, type);
 		setUint16(rawExtraFieldView, offset + 2, getLength(data));
 		arraySet(rawExtraField, data, offset + 4);
@@ -956,8 +990,8 @@ function resolveEntrySizes(zipWriter, hasContent, contentSize, metadata, options
 }
 
 async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comment) {
-	const zipWriter = { options: writerOptions, config: getConfiguration() };
-	if (writerOptions[OPTION_SIGN_CENTRAL_DIRECTORY]) {
+	const zipWriter = { options: writerOptions };
+	if (checkFunctionOption(writerOptions[OPTION_SIGN_CENTRAL_DIRECTORY])) {
 		throw new Error(ERR_UNDETERMINED_SIZE);
 	}
 	if (comment !== UNDEFINED_VALUE && !(comment instanceof Uint8Array)) {
@@ -983,7 +1017,7 @@ async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comm
 		({ name } = attributesInfo);
 		const { resolvedOptions: metadata } = resolveMetadata(zipWriter, name, options);
 		if (metadata.level != 0 && metadata.compressionMethod === UNDEFINED_VALUE &&
-			!metadata.passThrough && !(await supportsDeflate(zipWriter.config))) {
+			!metadata.passThrough && !(await supportsDeflate(getConfiguration()))) {
 			metadata.level = 0;
 		}
 		const hasContent = !getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY);
@@ -1032,7 +1066,7 @@ async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comm
 
 async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	const {
-		files,
+		fileEntries,
 		writer
 	} = zipWriter;
 	const {
@@ -1054,12 +1088,12 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	let writerSizeBeforeEntry;
 	let flushedBufferedSize = 0;
 	let fileWriter;
-	files.set(name, fileEntry);
+	fileEntries.set(name, fileEntry);
 	zipWriter.lastFileEntry = fileEntry;
 	try {
 		let lockPreviousFileEntry;
 		if (keepOrder) {
-			lockPreviousFileEntry = previousFileEntry && previousFileEntry.lock;
+			lockPreviousFileEntry = previousFileEntry && previousFileEntry.lockFileEntry;
 			requestLockCurrentFileEntry();
 		}
 		if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || !dataDescriptor) {
@@ -1080,11 +1114,8 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		const diskOffset = getDiskOffset(writer);
 		if (zipWriter.addSplitZipSignature) {
 			delete zipWriter.addSplitZipSignature;
-			const signatureArray = new Uint8Array(4);
-			const signatureArrayView = getDataView(signatureArray);
-			setUint32(signatureArrayView, 0, SPLIT_ZIP_FILE_SIGNATURE);
-			await writeData(writer, signatureArray);
-			zipWriter.offset += 4;
+			await writeData(writer, getSplitZipSignatureArray());
+			zipWriter.offset += SPLIT_ZIP_FILE_SIGNATURE_LENGTH;
 		}
 		if (usdz && !bufferedWrite) {
 			appendExtraFieldUSDZ(entryInfo, zipWriter.offset - diskOffset);
@@ -1102,11 +1133,11 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			writerSizeBeforeEntry = writer.size;
 			await writeData(fileWriter, localHeaderArray);
 		}
-		fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, zipWriter.config, options);
+		fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, getConfiguration(), options);
 		if (!bufferedWrite) {
 			writingEntryData = false;
 		}
-		files.set(name, fileEntry);
+		fileEntries.set(name, fileEntry);
 		fileEntry.filename = name;
 		if (bufferedWrite) {
 			await Promise.all([fileWriter.writable.getWriter().close(), lockPreviousFileEntry]);
@@ -1147,7 +1178,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 				zipWriter.offset += flushedBufferedSize;
 			}
 		}
-		files.delete(name);
+		fileEntries.delete(name);
 		throw error;
 	} finally {
 		if (bufferedWrite) {
@@ -1169,7 +1200,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	}
 
 	function requestLockCurrentFileEntry() {
-		fileEntry.lock = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
+		fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
 	}
 
 	async function requestLockWriter() {
@@ -1189,7 +1220,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	}
 }
 
-async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryInfo, config, options) {
+async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry }, entryInfo, config, options) {
 	const {
 		headerInfo,
 		dataDescriptorInfo,
@@ -1257,7 +1288,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		codecURI
 	} = options;
 	const fileEntry = {
-		lock,
+		lockFileEntry,
 		versionMadeBy,
 		zip64,
 		directory: Boolean(directory),
@@ -1299,7 +1330,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 	}
 	const { writable } = writer;
 	if (reader) {
-		const readable = toCompatibleReadable(reader.createReadable ? reader.createReadable() : reader.readable);
+		const readable = toCompatibleReadable(createReadable(reader));
 		const size = reader.size;
 		const workerOptions = {
 			options: {
@@ -1411,14 +1442,14 @@ function getHeaderInfo(options) {
 	if (zip64 && (zip64UncompressedSize || zip64CompressedSize)) {
 		const length = 4 + 16;
 		const extraFieldZip64 = createRecordWriter(length);
-		extraFieldZip64.uint16(EXTRAFIELD_TYPE_ZIP64);
-		extraFieldZip64.uint16(length - 4);
+		extraFieldZip64.writeUint16(EXTRAFIELD_TYPE_ZIP64);
+		extraFieldZip64.writeUint16(length - 4);
 		rawLocalExtraFieldZip64 = extraFieldZip64.array;
 		if (zip64ExtraFieldComplete) {
-			extraFieldZip64.uint64(uncompressedSize);
+			extraFieldZip64.writeUint64(uncompressedSize);
 			if (uncompressedFile) {
 				const encryptionOverhead = encrypted ? (zipCrypto ? 12 : 16 + encryptionStrength * 4) : 0;
-				extraFieldZip64.uint64(passThrough ? 0 : uncompressedSize + encryptionOverhead);
+				extraFieldZip64.writeUint64(passThrough ? 0 : uncompressedSize + encryptionOverhead);
 			}
 		}
 	} else {
@@ -1427,8 +1458,8 @@ function getHeaderInfo(options) {
 	let rawExtraFieldAES;
 	if (encrypted && !zipCrypto) {
 		const extraFieldAES = createRecordWriter(getLength(EXTRAFIELD_DATA_AES) + 2);
-		extraFieldAES.uint16(EXTRAFIELD_TYPE_AES);
-		extraFieldAES.bytes(EXTRAFIELD_DATA_AES);
+		extraFieldAES.writeUint16(EXTRAFIELD_TYPE_AES);
+		extraFieldAES.writeBytes(EXTRAFIELD_DATA_AES);
 		rawExtraFieldAES = extraFieldAES.array;
 		rawExtraFieldAES[8] = encryptionStrength;
 	} else {
@@ -1444,15 +1475,15 @@ function getHeaderInfo(options) {
 			const extraFieldTimestampLength = 9 + (lastAccessDate ? 4 : 0) + (creationDate ? 4 : 0);
 			const extraFieldTimestamp = createRecordWriter(extraFieldTimestampLength);
 			extraFieldExtendedTimestampFlag = 0x1 + (lastAccessDate ? 0x2 : 0) + (creationDate ? 0x4 : 0);
-			extraFieldTimestamp.uint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
-			extraFieldTimestamp.uint16(extraFieldTimestampLength - 4);
-			extraFieldTimestamp.uint8(extraFieldExtendedTimestampFlag);
-			extraFieldTimestamp.uint32(lastModTimeUnix);
+			extraFieldTimestamp.writeUint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
+			extraFieldTimestamp.writeUint16(extraFieldTimestampLength - 4);
+			extraFieldTimestamp.writeUint8(extraFieldExtendedTimestampFlag);
+			extraFieldTimestamp.writeUint32(lastModTimeUnix);
 			if (lastAccessDate) {
-				extraFieldTimestamp.uint32(clampUnixTime(getTimeUnix(lastAccessDate)));
+				extraFieldTimestamp.writeUint32(clampUnixTime(getTimeUnix(lastAccessDate)));
 			}
 			if (creationDate) {
-				extraFieldTimestamp.uint32(clampUnixTime(getTimeUnix(creationDate)));
+				extraFieldTimestamp.writeUint32(clampUnixTime(getTimeUnix(creationDate)));
 			}
 			rawExtraFieldExtendedTimestamp = extraFieldTimestamp.array;
 		} else {
@@ -1465,14 +1496,14 @@ function getHeaderInfo(options) {
 			try {
 				const lastModTimeNTFS = getTimeNTFS(lastModDate);
 				const extraFieldNTFS = createRecordWriter(36);
-				extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS);
-				extraFieldNTFS.uint16(32);
+				extraFieldNTFS.writeUint16(EXTRAFIELD_TYPE_NTFS);
+				extraFieldNTFS.writeUint16(32);
 				extraFieldNTFS.skip(4);
-				extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS_TAG1);
-				extraFieldNTFS.uint16(24);
-				extraFieldNTFS.uint64(lastModTimeNTFS);
-				extraFieldNTFS.uint64(lastAccessDate ? getTimeNTFS(lastAccessDate) : lastModTimeNTFS);
-				extraFieldNTFS.uint64(creationDate ? getTimeNTFS(creationDate) : lastModTimeNTFS);
+				extraFieldNTFS.writeUint16(EXTRAFIELD_TYPE_NTFS_TAG1);
+				extraFieldNTFS.writeUint16(24);
+				extraFieldNTFS.writeUint64(lastModTimeNTFS);
+				extraFieldNTFS.writeUint64(lastAccessDate ? getTimeNTFS(lastAccessDate) : lastModTimeNTFS);
+				extraFieldNTFS.writeUint64(creationDate ? getTimeNTFS(creationDate) : lastModTimeNTFS);
 				rawExtraFieldNTFS = extraFieldNTFS.array;
 			} catch {
 				rawExtraFieldNTFS = EMPTY_UINT8_ARRAY;
@@ -1491,20 +1522,20 @@ function getHeaderInfo(options) {
 			const gidBytes = packUnixId(gid);
 			const payloadLength = 3 + uidBytes.length + gidBytes.length;
 			const extraFieldUnix = createRecordWriter(4 + payloadLength);
-			extraFieldUnix.uint16(EXTRAFIELD_TYPE_INFOZIP);
-			extraFieldUnix.uint16(payloadLength);
-			extraFieldUnix.uint8(1);
-			extraFieldUnix.uint8(uidBytes.length);
-			extraFieldUnix.bytes(uidBytes);
-			extraFieldUnix.uint8(gidBytes.length);
-			extraFieldUnix.bytes(gidBytes);
+			extraFieldUnix.writeUint16(EXTRAFIELD_TYPE_INFOZIP);
+			extraFieldUnix.writeUint16(payloadLength);
+			extraFieldUnix.writeUint8(1);
+			extraFieldUnix.writeUint8(uidBytes.length);
+			extraFieldUnix.writeBytes(uidBytes);
+			extraFieldUnix.writeUint8(gidBytes.length);
+			extraFieldUnix.writeBytes(gidBytes);
 			rawExtraFieldUnix = extraFieldUnix.array;
 		} else if (unixExtraFieldType == UNIX_EXTRA_FIELD_TYPE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
 			const extraFieldUnix = createRecordWriter(8);
-			extraFieldUnix.uint16(EXTRAFIELD_TYPE_UNIX);
-			extraFieldUnix.uint16(4);
-			extraFieldUnix.uint16((uid === UNDEFINED_VALUE ? 0 : uid) & MAX_16_BITS);
-			extraFieldUnix.uint16((gid === UNDEFINED_VALUE ? 0 : gid) & MAX_16_BITS);
+			extraFieldUnix.writeUint16(EXTRAFIELD_TYPE_UNIX);
+			extraFieldUnix.writeUint16(4);
+			extraFieldUnix.writeUint16((uid === UNDEFINED_VALUE ? 0 : uid) & MAX_16_BITS);
+			extraFieldUnix.writeUint16((gid === UNDEFINED_VALUE ? 0 : gid) & MAX_16_BITS);
 			rawExtraFieldUnix = extraFieldUnix.array;
 		} else {
 			rawExtraFieldUnix = EMPTY_UINT8_ARRAY;
@@ -1554,18 +1585,18 @@ function getHeaderInfo(options) {
 	const localHeader = createRecordWriter(HEADER_SIZE + getLength(rawFilename) + extraFieldLength);
 	const localHeaderArray = localHeader.array;
 	const localHeaderView = getDataView(localHeaderArray);
-	localHeader.uint32(LOCAL_FILE_HEADER_SIGNATURE);
-	localHeader.bytes(headerArray);
-	localHeader.bytes(rawFilename);
+	localHeader.writeUint32(LOCAL_FILE_HEADER_SIGNATURE);
+	localHeader.writeBytes(headerArray);
+	localHeader.writeBytes(rawFilename);
 	if (writeLocalExtraFieldZip64) {
-		localHeader.bytes(rawLocalExtraFieldZip64);
-	}
-	localHeader.bytes(rawExtraFieldAES);
-	localHeader.bytes(rawExtraFieldExtendedTimestamp);
-	localHeader.bytes(rawExtraFieldNTFS);
-	localHeader.bytes(rawExtraFieldUnix);
-	localHeader.bytes(rawExtraField);
-	localHeader.bytes(rawLocalExtraField);
+		localHeader.writeBytes(rawLocalExtraFieldZip64);
+	}
+	localHeader.writeBytes(rawExtraFieldAES);
+	localHeader.writeBytes(rawExtraFieldExtendedTimestamp);
+	localHeader.writeBytes(rawExtraFieldNTFS);
+	localHeader.writeBytes(rawExtraFieldUnix);
+	localHeader.writeBytes(rawExtraField);
+	localHeader.writeBytes(rawLocalExtraField);
 	if (dataDescriptor) {
 		if (!zip64CompressedSize) {
 			setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, 0);
@@ -1755,7 +1786,7 @@ function updateLocalHeader({
 
 
 async function closeFile(zipWriter, comment, options) {
-	const directoryDataLength = createDirectoryRecords(zipWriter.files);
+	const directoryDataLength = createDirectoryRecords(zipWriter.fileEntries);
 	const { directoryStart, directoryArray } = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
 	const signatureLength = await writeDigitalSignatureRecord(zipWriter, directoryArray, options);
 	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryDataLength, signatureLength });
@@ -1785,19 +1816,19 @@ function createDirectoryRecords(files) {
 		if (zip64Offset || zip64DiskNumberStart || zip64UncompressedSize || zip64CompressedSize) {
 			const length = 4 + (zip64UncompressedSize ? 8 : 0) + (zip64CompressedSize ? 8 : 0) + (zip64Offset ? 8 : 0) + (zip64DiskNumberStart ? 4 : 0);
 			const extraFieldZip64 = createRecordWriter(length);
-			extraFieldZip64.uint16(EXTRAFIELD_TYPE_ZIP64);
-			extraFieldZip64.uint16(length - 4);
+			extraFieldZip64.writeUint16(EXTRAFIELD_TYPE_ZIP64);
+			extraFieldZip64.writeUint16(length - 4);
 			if (zip64UncompressedSize) {
-				extraFieldZip64.uint64(uncompressedSize);
+				extraFieldZip64.writeUint64(uncompressedSize);
 			}
 			if (zip64CompressedSize) {
-				extraFieldZip64.uint64(compressedSize);
+				extraFieldZip64.writeUint64(compressedSize);
 			}
 			if (zip64Offset) {
-				extraFieldZip64.uint64(fileEntry.offset);
+				extraFieldZip64.writeUint64(fileEntry.offset);
 			}
 			if (zip64DiskNumberStart) {
-				extraFieldZip64.uint32(fileEntry.diskNumberStart);
+				extraFieldZip64.writeUint32(fileEntry.diskNumberStart);
 			}
 			rawExtraFieldZip64 = extraFieldZip64.array;
 		} else {
@@ -1810,10 +1841,10 @@ function createDirectoryRecords(files) {
 		const lastModTimeUnix = getTimeUnix(lastModDate);
 		if (extendedTimestamp && inUnixTimeRange(lastModTimeUnix)) {
 			const extraFieldTimestamp = createRecordWriter(9);
-			extraFieldTimestamp.uint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
-			extraFieldTimestamp.uint16(5);
-			extraFieldTimestamp.uint8(extraFieldExtendedTimestampFlag);
-			extraFieldTimestamp.uint32(lastModTimeUnix);
+			extraFieldTimestamp.writeUint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
+			extraFieldTimestamp.writeUint16(5);
+			extraFieldTimestamp.writeUint8(extraFieldExtendedTimestampFlag);
+			extraFieldTimestamp.writeUint32(lastModTimeUnix);
 			rawExtraFieldTimestamp = extraFieldTimestamp.array;
 		} else {
 			rawExtraFieldTimestamp = EMPTY_UINT8_ARRAY;
@@ -1835,14 +1866,14 @@ function createDirectoryRecords(files) {
 }
 
 async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
-	const { files, writer } = zipWriter;
+	const { fileEntries, writer } = zipWriter;
 	const directoryArray = new Uint8Array(directoryDataLength);
 	await initStream(writer);
 	let offset = 0;
 	let directoryDiskOffset = 0;
 	let directoryStartDiskNumber = getDiskNumber(writer);
 	let directoryStartDiskOffset = getDiskOffset(writer);
-	for (const [indexFileEntry, fileEntry] of Array.from(files.values()).entries()) {
+	for (const [indexFileEntry, fileEntry] of Array.from(fileEntries.values()).entries()) {
 		const {
 			offset: fileEntryOffset,
 			rawFilename,
@@ -1887,28 +1918,28 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 			setUint16(headerView, HEADER_OFFSET_VERSION, VERSION_ZIP64);
 		}
 		const directoryRecord = createRecordWriter(directoryRecordLength);
-		directoryRecord.uint32(CENTRAL_FILE_HEADER_SIGNATURE);
-		directoryRecord.uint16(versionMadeBy);
-		directoryRecord.bytes(headerArray.subarray(0, HEADER_SIZE - 4 - 2));
-		directoryRecord.uint16(extraFieldLength);
-		directoryRecord.uint16(getLength(rawComment));
-		directoryRecord.uint16(zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
-		directoryRecord.uint16(internalFileAttributes);
-		directoryRecord.uint32(externalFileAttributes);
-		directoryRecord.uint32(zip64Offset ? MAX_32_BITS : fileEntryOffset);
-		directoryRecord.bytes(rawFilename);
-		directoryRecord.bytes(rawExtraFieldZip64);
-		directoryRecord.bytes(rawExtraFieldAES);
-		directoryRecord.bytes(rawExtraFieldExtendedTimestamp);
-		directoryRecord.bytes(rawExtraFieldNTFS);
-		directoryRecord.bytes(rawExtraFieldUnix);
-		directoryRecord.bytes(rawExtraField);
-		directoryRecord.bytes(rawComment);
+		directoryRecord.writeUint32(CENTRAL_FILE_HEADER_SIGNATURE);
+		directoryRecord.writeUint16(versionMadeBy);
+		directoryRecord.writeBytes(headerArray.subarray(0, HEADER_SIZE - 4 - 2));
+		directoryRecord.writeUint16(extraFieldLength);
+		directoryRecord.writeUint16(getLength(rawComment));
+		directoryRecord.writeUint16(zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
+		directoryRecord.writeUint16(internalFileAttributes);
+		directoryRecord.writeUint32(externalFileAttributes);
+		directoryRecord.writeUint32(zip64Offset ? MAX_32_BITS : fileEntryOffset);
+		directoryRecord.writeBytes(rawFilename);
+		directoryRecord.writeBytes(rawExtraFieldZip64);
+		directoryRecord.writeBytes(rawExtraFieldAES);
+		directoryRecord.writeBytes(rawExtraFieldExtendedTimestamp);
+		directoryRecord.writeBytes(rawExtraFieldNTFS);
+		directoryRecord.writeBytes(rawExtraFieldUnix);
+		directoryRecord.writeBytes(rawExtraField);
+		directoryRecord.writeBytes(rawComment);
 		arraySet(directoryArray, directoryRecord.array, offset);
 		offset += directoryRecordLength;
 		if (options.onprogress) {
 			try {
-				await options.onprogress(indexFileEntry + 1, files.size, new Entry(fileEntry));
+				await options.onprogress(indexFileEntry + 1, fileEntries.size, new Entry(fileEntry));
 			} catch {
 				// ignored
 			}
@@ -1922,7 +1953,7 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 }
 
 async function writeDigitalSignatureRecord(zipWriter, directoryArray, options) {
-	const signCentralDirectory = getOptionValue(zipWriter, options, OPTION_SIGN_CENTRAL_DIRECTORY);
+	const signCentralDirectory = getFunctionOptionValue(zipWriter, options, OPTION_SIGN_CENTRAL_DIRECTORY);
 	if (signCentralDirectory) {
 		const signatureData = await signCentralDirectory(directoryArray);
 		const signatureDataLength = getLength(signatureData);
@@ -1930,9 +1961,9 @@ async function writeDigitalSignatureRecord(zipWriter, directoryArray, options) {
 			throw new Error(ERR_INVALID_SIGNATURE_DATA);
 		}
 		const signatureRecord = createRecordWriter(6 + signatureDataLength);
-		signatureRecord.uint32(DIGITAL_SIGNATURE_RECORD_SIGNATURE);
-		signatureRecord.uint16(signatureDataLength);
-		signatureRecord.bytes(signatureData);
+		signatureRecord.writeUint32(DIGITAL_SIGNATURE_RECORD_SIGNATURE);
+		signatureRecord.writeUint16(signatureDataLength);
+		signatureRecord.writeBytes(signatureData);
 		await writeData(zipWriter.writer, signatureRecord.array);
 		return 6 + signatureDataLength;
 	}
@@ -1943,7 +1974,7 @@ async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 	const { writer } = zipWriter;
 	const { directoryStart, signatureLength } = cdInfo;
 	let { directoryDataLength } = cdInfo;
-	let filesLength = zipWriter.files.size;
+	let fileEntriesLength = zipWriter.fileEntries.size;
 	let diskNumber = directoryStart.diskNumber;
 	let directoryOffset = getSegmentOffset(zipWriter, directoryStart);
 	let lastDiskNumber = getDiskNumber(writer);
@@ -1951,7 +1982,7 @@ async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 		lastDiskNumber++;
 	}
 	let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
-	if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || filesLength >= MAX_16_BITS || lastDiskNumber >= MAX_16_BITS) {
+	if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || fileEntriesLength >= MAX_16_BITS || lastDiskNumber >= MAX_16_BITS) {
 		if (zip64 === false) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		} else {
@@ -1968,37 +1999,37 @@ async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 	}
 	lastDiskNumber = getDiskNumber(writer);
 	if (zip64) {
-		endOfdirectoryRecord.uint32(ZIP64_END_OF_CENTRAL_DIR_SIGNATURE);
-		endOfdirectoryRecord.uint64(44);
-		endOfdirectoryRecord.uint16(45);
-		endOfdirectoryRecord.uint16(45);
-		endOfdirectoryRecord.uint32(lastDiskNumber);
-		endOfdirectoryRecord.uint32(diskNumber);
-		endOfdirectoryRecord.uint64(filesLength);
-		endOfdirectoryRecord.uint64(filesLength);
-		endOfdirectoryRecord.uint64(directoryDataLength);
-		endOfdirectoryRecord.uint64(directoryOffset);
-		endOfdirectoryRecord.uint32(ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE);
-		endOfdirectoryRecord.uint32(lastDiskNumber);
-		endOfdirectoryRecord.uint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength) + BigInt(signatureLength));
-		endOfdirectoryRecord.uint32(lastDiskNumber + 1);
+		endOfdirectoryRecord.writeUint32(ZIP64_END_OF_CENTRAL_DIR_SIGNATURE);
+		endOfdirectoryRecord.writeUint64(44);
+		endOfdirectoryRecord.writeUint16(45);
+		endOfdirectoryRecord.writeUint16(45);
+		endOfdirectoryRecord.writeUint32(lastDiskNumber);
+		endOfdirectoryRecord.writeUint32(diskNumber);
+		endOfdirectoryRecord.writeUint64(fileEntriesLength);
+		endOfdirectoryRecord.writeUint64(fileEntriesLength);
+		endOfdirectoryRecord.writeUint64(directoryDataLength);
+		endOfdirectoryRecord.writeUint64(directoryOffset);
+		endOfdirectoryRecord.writeUint32(ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE);
+		endOfdirectoryRecord.writeUint32(lastDiskNumber);
+		endOfdirectoryRecord.writeUint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength) + BigInt(signatureLength));
+		endOfdirectoryRecord.writeUint32(lastDiskNumber + 1);
 		const supportZip64SplitFile = getOptionValue(zipWriter, options, OPTION_SUPPORT_ZIP64_SPLIT_FILE, true);
 		if (supportZip64SplitFile) {
 			lastDiskNumber = MAX_16_BITS;
 			diskNumber = MAX_16_BITS;
 		}
-		filesLength = MAX_16_BITS;
+		fileEntriesLength = MAX_16_BITS;
 		directoryOffset = MAX_32_BITS;
 		directoryDataLength = MAX_32_BITS;
 	}
-	endOfdirectoryRecord.uint32(END_OF_CENTRAL_DIR_SIGNATURE);
-	endOfdirectoryRecord.uint16(lastDiskNumber);
-	endOfdirectoryRecord.uint16(diskNumber);
-	endOfdirectoryRecord.uint16(filesLength);
-	endOfdirectoryRecord.uint16(filesLength);
-	endOfdirectoryRecord.uint32(directoryDataLength);
-	endOfdirectoryRecord.uint32(directoryOffset);
-	endOfdirectoryRecord.uint16(commentLength);
+	endOfdirectoryRecord.writeUint32(END_OF_CENTRAL_DIR_SIGNATURE);
+	endOfdirectoryRecord.writeUint16(lastDiskNumber);
+	endOfdirectoryRecord.writeUint16(diskNumber);
+	endOfdirectoryRecord.writeUint16(fileEntriesLength);
+	endOfdirectoryRecord.writeUint16(fileEntriesLength);
+	endOfdirectoryRecord.writeUint32(directoryDataLength);
+	endOfdirectoryRecord.writeUint32(directoryOffset);
+	endOfdirectoryRecord.writeUint16(commentLength);
 	await writeData(writer, endOfdirectoryRecord.array);
 	if (commentLength) {
 		await writeData(writer, comment);
@@ -2011,11 +2042,11 @@ function createRecordWriter(length) {
 	let offset = 0;
 	return {
 		array,
-		uint8: value => { setUint8(view, offset, value); offset += 1; },
-		uint16: value => { setUint16(view, offset, value); offset += 2; },
-		uint32: value => { setUint32(view, offset, value); offset += 4; },
-		uint64: value => { setBigUint64(view, offset, BigInt(value)); offset += 8; },
-		bytes: value => { arraySet(array, value, offset); offset += getLength(value); },
+		writeUint8: value => { setUint8(view, offset, value); offset += 1; },
+		writeUint16: value => { setUint16(view, offset, value); offset += 2; },
+		writeUint32: value => { setUint32(view, offset, value); offset += 4; },
+		writeUint64: value => { setBigUint64(view, offset, BigInt(value)); offset += 8; },
+		writeBytes: value => { arraySet(array, value, offset); offset += getLength(value); },
 		skip: count => offset += count
 	};
 }
@@ -2039,6 +2070,71 @@ function getSegmentOffset(zipWriter, { diskNumber = 0, diskOffset = 0 }) {
 	return zipWriter.offset - diskOffset - (diskNumber ? zipWriter.initialOffset : 0);
 }
 
+async function startsWithSplitZipSignature(reader) {
+	const signatureArray = await readUint8Array(reader, 0, SPLIT_ZIP_FILE_SIGNATURE_LENGTH);
+	return getUint32(getDataView(signatureArray), 0) == SPLIT_ZIP_FILE_SIGNATURE;
+}
+
+async function copyZipData(zipWriter, reader, entries, directoryOffset, splitZipSignatureLength) {
+	const { writer } = zipWriter;
+	const entryPositions = new Map();
+	if (writer.closeDisk) {
+		const sortedEntries = Array.from(entries).sort((firstEntry, secondEntry) =>
+			getSourceOffset(reader, firstEntry) - getSourceOffset(reader, secondEntry));
+		let copiedLength = 0;
+		for (const entry of sortedEntries) {
+			const sourceOffset = getSourceOffset(reader, entry);
+			await copyData(zipWriter, reader, copiedLength, sourceOffset - copiedLength);
+			if (exceedsAvailableSize(writer, await getLocalHeaderLength(reader, sourceOffset))) {
+				await writer.closeDisk();
+			}
+			entryPositions.set(entry, {
+				offset: getSegmentOffset(zipWriter, writer),
+				diskNumberStart: getDiskNumber(writer)
+			});
+			copiedLength = sourceOffset;
+		}
+		await copyData(zipWriter, reader, copiedLength, directoryOffset - copiedLength);
+	} else {
+		await copyData(zipWriter, reader, 0, directoryOffset);
+		entries.forEach(entry => entryPositions.set(entry, {
+			offset: splitZipSignatureLength + getSourceOffset(reader, entry),
+			diskNumberStart: 0
+		}));
+	}
+	return entryPositions;
+}
+
+async function copyData(zipWriter, reader, offset, size) {
+	if (size > 0) {
+		const { writer } = zipWriter;
+		await createReadable(reader, { offset, size }).pipeTo(writer.writable, { preventClose: true, preventAbort: true });
+		writer.size += size;
+		zipWriter.offset += size;
+	}
+}
+
+async function getLocalHeaderLength(reader, offset) {
+	const headerArray = await readUint8Array(reader, offset, HEADER_SIZE);
+	if (getLength(headerArray) < HEADER_SIZE) {
+		return HEADER_SIZE;
+	}
+	const headerView = getDataView(headerArray);
+	return HEADER_SIZE +
+		getUint16(headerView, HEADER_OFFSET_FILENAME_LENGTH + LOCAL_HEADER_COMMON_OFFSET) +
+		getUint16(headerView, HEADER_OFFSET_EXTRAFIELD_LENGTH + LOCAL_HEADER_COMMON_OFFSET);
+}
+
+function getSourceOffset(reader, { offset, diskNumberStart }) {
+	return offset + (reader.getDiskOffset ? reader.getDiskOffset(diskNumberStart) : 0);
+}
+
+function getSplitZipSignatureArray() {
+	const signatureArray = new Uint8Array(SPLIT_ZIP_FILE_SIGNATURE_LENGTH);
+	setUint32(getDataView(signatureArray), 0, SPLIT_ZIP_FILE_SIGNATURE);
+	return signatureArray;
+}
+
 async function writeData(writer, array) {
 	const { writable } = writer;
 	const streamWriter = writable.getWriter();
@@ -2090,6 +2186,21 @@ function getOptionValue(zipWriter, options, name, defaultValue) {
 	return result === UNDEFINED_VALUE ? defaultValue : result;
 }
 
+function getDateOptionValue(zipWriter, options, name, defaultValue) {
+	const date = getOptionValue(zipWriter, options, name, defaultValue);
+	if (date === null) {
+		return defaultValue;
+	}
+	if (date !== UNDEFINED_VALUE && (typeof date.getTime != FUNCTION_TYPE || Number.isNaN(date.getTime()))) {
+		throw new Error(ERR_INVALID_DATE);
+	}
+	return date;
+}
+
+function getFunctionOptionValue(zipWriter, options, name) {
+	return checkFunctionOption(getOptionValue(zipWriter, options, name));
+}
+
 function getAliasedOptionValue(zipWriter, options, name, deprecatedName, defaultValue) {
 	const value = getAliasedValue(options, name, deprecatedName);
 	const result = value === UNDEFINED_VALUE ? getAliasedValue(zipWriter.options, name, deprecatedName) : value;
@@ -2104,9 +2215,6 @@ function getNumberOptionValue(zipWriter, options, name, defaultValue) {
 	return toNumber(getOptionValue(zipWriter, options, name, defaultValue));
 }
 
-function toNumber(value) {
-	return typeof value == STRING_TYPE && value.trim() ? Number(value) : value;
-}
 
 function getMaximumCompressedSize(uncompressedSize) {
 	return uncompressedSize + (5 * (Math.floor(uncompressedSize / 16383) + 1));
@@ -2118,6 +2226,14 @@ function isCompressed(compressionMethod, level) {
 		: compressionMethod !== COMPRESSION_METHOD_STORE;
 }
 
+function getUint16(view, offset) {
+	return view.getUint16(offset, true);
+}
+
+function getUint32(view, offset) {
+	return view.getUint32(offset, true);
+}
+
 function setUint8(view, offset, value) {
 	view.setUint8(offset, value);
 }
@@ -2161,9 +2277,9 @@ function getHeaderArrayData({
 	const headerRecord = createRecordWriter(HEADER_SIZE - 4);
 	const headerArray = headerRecord.array;
 	const headerView = getDataView(headerArray);
-	headerRecord.uint16(version);
-	headerRecord.uint16(bitFlag);
-	headerRecord.uint16(compressionMethod);
+	headerRecord.writeUint16(version);
+	headerRecord.writeUint16(bitFlag);
+	headerRecord.writeUint16(compressionMethod);
 	if (rawLastModDate === UNDEFINED_VALUE) {
 		const dateArray = new Uint32Array(1);
 		const dateView = getDataView(dateArray);
@@ -2171,20 +2287,20 @@ function getHeaderArrayData({
 		setUint16(dateView, 2, ((((lastModDate.getFullYear() - 1980) << 4) | (lastModDate.getMonth() + 1)) << 5) | lastModDate.getDate());
 		rawLastModDate = dateArray[0];
 	}
-	headerRecord.uint32(rawLastModDate);
+	headerRecord.writeUint32(rawLastModDate);
 	headerRecord.skip(4);
 	if (zip64CompressedSize || compressedSize !== UNDEFINED_VALUE) {
-		headerRecord.uint32(zip64CompressedSize ? MAX_32_BITS : compressedSize);
+		headerRecord.writeUint32(zip64CompressedSize ? MAX_32_BITS : compressedSize);
 	} else {
 		headerRecord.skip(4);
 	}
 	if (zip64UncompressedSize || uncompressedSize !== UNDEFINED_VALUE) {
-		headerRecord.uint32(zip64UncompressedSize ? MAX_32_BITS : uncompressedSize);
+		headerRecord.writeUint32(zip64UncompressedSize ? MAX_32_BITS : uncompressedSize);
 	} else {
 		headerRecord.skip(4);
 	}
-	headerRecord.uint16(getLength(rawFilename));
-	headerRecord.uint16(extraFieldLength);
+	headerRecord.writeUint16(getLength(rawFilename));
+	headerRecord.writeUint16(extraFieldLength);
 	return {
 		headerArray,
 		headerView,