add constants

Author: gildas-lormeau

lib/core/constants.js

@@ -28,6 +28,7 @@
 
 const MAX_32_BITS = 0xffffffff;
 const MAX_16_BITS = 0xffff;
+const MAX_8_BITS = 0xff;
 const COMPRESSION_METHOD_DEFLATE = 0x08;
 const COMPRESSION_METHOD_DEFLATE_64 = 0x09;
 const COMPRESSION_METHOD_STORE = 0x00;
@@ -88,10 +89,12 @@ const MIN_DATE = new Date(1980, 0, 1);
 const UNDEFINED_VALUE = undefined;
 const UNDEFINED_TYPE = "undefined";
 const FUNCTION_TYPE = "function";
+const OBJECT_TYPE = "object";
 
 export {
 	MAX_32_BITS,
 	MAX_16_BITS,
+	MAX_8_BITS,
 	COMPRESSION_METHOD_DEFLATE,
 	COMPRESSION_METHOD_DEFLATE_64,
 	COMPRESSION_METHOD_STORE,
@@ -142,5 +145,6 @@ export {
 	MAX_DATE,
 	UNDEFINED_VALUE,
 	UNDEFINED_TYPE,
-	FUNCTION_TYPE
+	FUNCTION_TYPE,
+	OBJECT_TYPE
 };

lib/core/zip-reader.js

@@ -32,6 +32,7 @@
 import {
 	MAX_32_BITS,
 	MAX_16_BITS,
+	MAX_8_BITS,
 	COMPRESSION_METHOD_DEFLATE,
 	COMPRESSION_METHOD_STORE,
 	COMPRESSION_METHOD_AES,
@@ -142,6 +143,7 @@ const ERR_UNSUPPORTED_COMPRESSION = "Compression method not supported";
 const ERR_SPLIT_ZIP_FILE = "Split zip file";
 const ERR_OVERLAPPING_ENTRY = "Overlapping entry found";
 const CHARSET_UTF8 = "utf-8";
+const PROPERTY_NAME_UTF8_SUFFIX = "UTF8";
 const CHARSET_CP437 = "cp437";
 const ZIP64_PROPERTIES = [
 	[PROPERTY_NAME_UNCOMPRESSED_SIZE, MAX_32_BITS],
@@ -534,7 +536,7 @@ class ZipEntry {
 				zipCrypto,
 				encryptionStrength: extraFieldAES && extraFieldAES.strength,
 				signed: getOptionValue(zipEntry, options, OPTION_CHECK_SIGNATURE) && !passThrough,
-				passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & 0xFF) : ((signature >>> 24) & 0xFF)),
+				passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((signature >>> 24) & MAX_8_BITS)),
 				outputSize: passThrough ? compressedSize : uncompressedSize,
 				signature,
 				compressed: compressionMethod != 0 && !passThrough,
@@ -706,7 +708,7 @@ function readExtraFieldUnicode(extraFieldUnicode, propertyName, rawPropertyName,
 	});
 	if (extraFieldUnicode.valid) {
 		directory[propertyName] = extraFieldUnicode[propertyName];
-		directory[propertyName + "UTF8"] = true;
+		directory[propertyName + PROPERTY_NAME_UTF8_SUFFIX] = true;
 	}
 }
 
@@ -888,7 +890,7 @@ function getOptionValue(zipReader, options, name) {
 }
 
 function getDate(timeRaw) {
-	const date = (timeRaw & 0xffff0000) >> 16, time = timeRaw & 0x0000ffff;
+	const date = (timeRaw & 0xffff0000) >> 16, time = timeRaw & MAX_16_BITS;
 	try {
 		return new Date(1980 + ((date & 0xFE00) >> 9), ((date & 0x01E0) >> 5) - 1, date & 0x001F, (time & 0xF800) >> 11, (time & 0x07E0) >> 5, (time & 0x001F) * 2, 0);
 	} catch {

lib/core/zip-writer.js

@@ -32,6 +32,7 @@
 import {
 	MAX_32_BITS,
 	MAX_16_BITS,
+	MAX_8_BITS,
 	COMPRESSION_METHOD_DEFLATE,
 	COMPRESSION_METHOD_DEFLATE_64,
 	COMPRESSION_METHOD_STORE,
@@ -76,7 +77,8 @@ import {
 	HEADER_OFFSET_UNCOMPRESSED_SIZE,
 	MIN_DATE,
 	MAX_DATE,
-	UNDEFINED_VALUE
+	UNDEFINED_VALUE,
+	OBJECT_TYPE
 } from "./constants.js";
 import {
 	getConfiguration,
@@ -342,7 +344,7 @@ class ZipWriterStream {
 		return writable;
 	}
 
-	close(comment = undefined, options = {}) {
+	close(comment = UNDEFINED_VALUE, options = {}) {
 		return this.zipWriter.close(comment, options);
 	}
 }
@@ -825,7 +827,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 				password,
 				encryptionStrength,
 				zipCrypto: encrypted && zipCrypto,
-				passwordVerification: encrypted && zipCrypto && (rawLastModDate >> 8) & 0xFF,
+				passwordVerification: encrypted && zipCrypto && (rawLastModDate >> 8) & MAX_8_BITS,
 				signed: !passThrough,
 				compressed: compressed && !passThrough,
 				encrypted: encrypted && !passThrough,