@loaders.gl/zip 4.0.0-beta.8 → 4.0.1

package/dist/dist.dev.js

@@ -7478,6 +7478,7 @@ var __exports__ = (() => {
   var CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
   var CD_FILE_NAME_LENGTH_OFFSET = 28n;
   var CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;
+  var CD_START_DISK_OFFSET = 32n;
   var CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;
   var CD_FILE_NAME_OFFSET = 46n;
   var signature = new Uint8Array([80, 75, 1, 2]);
@@ -7486,36 +7487,31 @@ var __exports__ = (() => {
     if (!compareArrayBuffers(magicBytes, signature.buffer)) {
       return null;
     }
-    let compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
-    let uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
+    const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
+    const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
     const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);
+    const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));
     const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);
     const filenameBytes = await file.slice(headerOffset + CD_FILE_NAME_OFFSET, headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength));
     const fileName = new TextDecoder().decode(filenameBytes);
     const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);
     const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);
-    let fileDataOffset = BigInt(oldFormatOffset);
-    let offsetInZip64Data = 4n;
-    if (uncompressedSize === BigInt(4294967295)) {
-      uncompressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-      offsetInZip64Data += 8n;
-    }
-    if (compressedSize === BigInt(4294967295)) {
-      compressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-      offsetInZip64Data += 8n;
-    }
-    if (fileDataOffset === BigInt(4294967295)) {
-      fileDataOffset = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    }
-    const localHeaderOffset = fileDataOffset;
-    return {
-      compressedSize,
+    const localHeaderOffset = BigInt(oldFormatOffset);
+    const extraField = new DataView(await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength)));
+    const zip64data = {
       uncompressedSize,
+      compressedSize,
+      localHeaderOffset,
+      startDisk
+    };
+    const res = findZip64DataInExtra(zip64data, extraField);
+    return {
+      ...zip64data,
+      ...res,
       extraFieldLength,
       fileNameLength,
       fileName,
-      extraOffset,
-      localHeaderOffset
+      extraOffset
     };
   };
   async function* makeZipCDHeaderIterator(fileProvider) {
@@ -7528,6 +7524,52 @@ var __exports__ = (() => {
       cdHeader = await parseZipCDFileHeader(cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength), fileProvider);
     }
   }
+  var getUint16 = (...bytes) => {
+    return bytes[0] + bytes[1] * 16;
+  };
+  var findZip64DataInExtra = (zip64data, extraField) => {
+    const zip64dataList = findExpectedData(zip64data);
+    const zip64DataRes = {};
+    if (zip64dataList.length > 0) {
+      const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);
+      const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex((_val, i, arr) => getUint16(arr[i], arr[i + 1]) === 1 && getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize);
+      let bytesRead = 0;
+      for (const note of zip64dataList) {
+        const offset = bytesRead;
+        zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);
+        bytesRead = offset + note.length;
+      }
+    }
+    return zip64DataRes;
+  };
+  var findExpectedData = (zip64data) => {
+    const zip64dataList = [];
+    if (zip64data.uncompressedSize === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "uncompressedSize",
+        length: 8
+      });
+    }
+    if (zip64data.compressedSize === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "compressedSize",
+        length: 8
+      });
+    }
+    if (zip64data.localHeaderOffset === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "localHeaderOffset",
+        length: 8
+      });
+    }
+    if (zip64data.startDisk === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "startDisk",
+        length: 4
+      });
+    }
+    return zip64dataList;
+  };
 
   // src/parse-zip/local-file-header.ts
   var COMPRESSION_METHOD_OFFSET = 8n;

package/dist/index.cjs

@@ -401,6 +401,7 @@ var CD_COMPRESSED_SIZE_OFFSET = 20n;
 var CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
 var CD_FILE_NAME_LENGTH_OFFSET = 28n;
 var CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;
+var CD_START_DISK_OFFSET = 32n;
 var CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;
 var CD_FILE_NAME_OFFSET = 46n;
 var signature = new Uint8Array([80, 75, 1, 2]);
@@ -409,9 +410,10 @@ var parseZipCDFileHeader = async (headerOffset, file) => {
   if (!(0, import_loader_utils2.compareArrayBuffers)(magicBytes, signature.buffer)) {
     return null;
   }
-  let compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
-  let uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
+  const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
+  const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
   const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);
+  const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));
   const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);
   const filenameBytes = await file.slice(
     headerOffset + CD_FILE_NAME_OFFSET,
@@ -420,28 +422,24 @@ var parseZipCDFileHeader = async (headerOffset, file) => {
   const fileName = new TextDecoder().decode(filenameBytes);
   const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);
   const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);
-  let fileDataOffset = BigInt(oldFormatOffset);
-  let offsetInZip64Data = 4n;
-  if (uncompressedSize === BigInt(4294967295)) {
-    uncompressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
-  }
-  if (compressedSize === BigInt(4294967295)) {
-    compressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
-  }
-  if (fileDataOffset === BigInt(4294967295)) {
-    fileDataOffset = await file.getBigUint64(extraOffset + offsetInZip64Data);
-  }
-  const localHeaderOffset = fileDataOffset;
-  return {
-    compressedSize,
+  const localHeaderOffset = BigInt(oldFormatOffset);
+  const extraField = new DataView(
+    await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength))
+  );
+  const zip64data = {
     uncompressedSize,
+    compressedSize,
+    localHeaderOffset,
+    startDisk
+  };
+  const res = findZip64DataInExtra(zip64data, extraField);
+  return {
+    ...zip64data,
+    ...res,
     extraFieldLength,
     fileNameLength,
     fileName,
-    extraOffset,
-    localHeaderOffset
+    extraOffset
   };
 };
 async function* makeZipCDHeaderIterator(fileProvider) {
@@ -455,6 +453,42 @@ async function* makeZipCDHeaderIterator(fileProvider) {
     );
   }
 }
+var getUint16 = (...bytes) => {
+  return bytes[0] + bytes[1] * 16;
+};
+var findZip64DataInExtra = (zip64data, extraField) => {
+  const zip64dataList = findExpectedData(zip64data);
+  const zip64DataRes = {};
+  if (zip64dataList.length > 0) {
+    const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);
+    const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex(
+      (_val, i, arr) => getUint16(arr[i], arr[i + 1]) === 1 && getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize
+    );
+    let bytesRead = 0;
+    for (const note of zip64dataList) {
+      const offset = bytesRead;
+      zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);
+      bytesRead = offset + note.length;
+    }
+  }
+  return zip64DataRes;
+};
+var findExpectedData = (zip64data) => {
+  const zip64dataList = [];
+  if (zip64data.uncompressedSize === BigInt(4294967295)) {
+    zip64dataList.push({ name: "uncompressedSize", length: 8 });
+  }
+  if (zip64data.compressedSize === BigInt(4294967295)) {
+    zip64dataList.push({ name: "compressedSize", length: 8 });
+  }
+  if (zip64data.localHeaderOffset === BigInt(4294967295)) {
+    zip64dataList.push({ name: "localHeaderOffset", length: 8 });
+  }
+  if (zip64data.startDisk === BigInt(4294967295)) {
+    zip64dataList.push({ name: "startDisk", length: 4 });
+  }
+  return zip64dataList;
+};
 
 // src/parse-zip/local-file-header.ts
 var import_loader_utils3 = require("@loaders.gl/loader-utils");

package/dist/parse-zip/cd-file-header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cd-file-header.d.ts","sourceRoot":"","sources":["../../src/parse-zip/cd-file-header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAsB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,sBAAsB;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAUF,eAAO,MAAM,SAAS,EAAE,YAAuD,CAAC;AAEhF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,iBACjB,MAAM,QACd,YAAY,KACjB,QAAQ,eAAe,GAAG,IAAI,CA4ChC,CAAC;AAEF;;;GAGG;AACH,wBAAuB,uBAAuB,CAC5C,YAAY,EAAE,YAAY,GACzB,aAAa,CAAC,eAAe,CAAC,CAUhC"}
+{"version":3,"file":"cd-file-header.d.ts","sourceRoot":"","sources":["../../src/parse-zip/cd-file-header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAsB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,sBAAsB;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAyBF,eAAO,MAAM,SAAS,EAAE,YAAuD,CAAC;AAEhF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,iBACjB,MAAM,QACd,YAAY,KACjB,QAAQ,eAAe,GAAG,IAAI,CA2ChC,CAAC;AAEF;;;GAGG;AACH,wBAAuB,uBAAuB,CAC5C,YAAY,EAAE,YAAY,GACzB,aAAa,CAAC,eAAe,CAAC,CAUhC"}

package/dist/parse-zip/cd-file-header.js

@@ -4,6 +4,7 @@ const CD_COMPRESSED_SIZE_OFFSET = 20n;
 const CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
 const CD_FILE_NAME_LENGTH_OFFSET = 28n;
 const CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;
+const CD_START_DISK_OFFSET = 32n;
 const CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;
 const CD_FILE_NAME_OFFSET = 46n;
 export const signature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);
@@ -12,36 +13,31 @@ export const parseZipCDFileHeader = async (headerOffset, file) => {
   if (!compareArrayBuffers(magicBytes, signature.buffer)) {
     return null;
   }
-  let compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
-  let uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
+  const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
+  const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
   const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);
+  const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));
   const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);
   const filenameBytes = await file.slice(headerOffset + CD_FILE_NAME_OFFSET, headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength));
   const fileName = new TextDecoder().decode(filenameBytes);
   const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);
   const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);
-  let fileDataOffset = BigInt(oldFormatOffset);
-  let offsetInZip64Data = 4n;
-  if (uncompressedSize === BigInt(0xffffffff)) {
-    uncompressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
-  }
-  if (compressedSize === BigInt(0xffffffff)) {
-    compressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
-  }
-  if (fileDataOffset === BigInt(0xffffffff)) {
-    fileDataOffset = await file.getBigUint64(extraOffset + offsetInZip64Data);
-  }
-  const localHeaderOffset = fileDataOffset;
-  return {
-    compressedSize,
+  const localHeaderOffset = BigInt(oldFormatOffset);
+  const extraField = new DataView(await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength)));
+  const zip64data = {
     uncompressedSize,
+    compressedSize,
+    localHeaderOffset,
+    startDisk
+  };
+  const res = findZip64DataInExtra(zip64data, extraField);
+  return {
+    ...zip64data,
+    ...res,
     extraFieldLength,
     fileNameLength,
     fileName,
-    extraOffset,
-    localHeaderOffset
+    extraOffset
   };
 };
 export async function* makeZipCDHeaderIterator(fileProvider) {
@@ -54,4 +50,50 @@ export async function* makeZipCDHeaderIterator(fileProvider) {
     cdHeader = await parseZipCDFileHeader(cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength), fileProvider);
   }
 }
+const getUint16 = function () {
+  return (arguments.length <= 0 ? undefined : arguments[0]) + (arguments.length <= 1 ? undefined : arguments[1]) * 16;
+};
+const findZip64DataInExtra = (zip64data, extraField) => {
+  const zip64dataList = findExpectedData(zip64data);
+  const zip64DataRes = {};
+  if (zip64dataList.length > 0) {
+    const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);
+    const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex((_val, i, arr) => getUint16(arr[i], arr[i + 1]) === 0x0001 && getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize);
+    let bytesRead = 0;
+    for (const note of zip64dataList) {
+      const offset = bytesRead;
+      zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);
+      bytesRead = offset + note.length;
+    }
+  }
+  return zip64DataRes;
+};
+const findExpectedData = zip64data => {
+  const zip64dataList = [];
+  if (zip64data.uncompressedSize === BigInt(0xffffffff)) {
+    zip64dataList.push({
+      name: 'uncompressedSize',
+      length: 8
+    });
+  }
+  if (zip64data.compressedSize === BigInt(0xffffffff)) {
+    zip64dataList.push({
+      name: 'compressedSize',
+      length: 8
+    });
+  }
+  if (zip64data.localHeaderOffset === BigInt(0xffffffff)) {
+    zip64dataList.push({
+      name: 'localHeaderOffset',
+      length: 8
+    });
+  }
+  if (zip64data.startDisk === BigInt(0xffffffff)) {
+    zip64dataList.push({
+      name: 'startDisk',
+      length: 4
+    });
+  }
+  return zip64dataList;
+};
 //# sourceMappingURL=cd-file-header.js.map

package/dist/parse-zip/cd-file-header.js.map

@@ -1 +1 @@
-{"version":3,"file":"cd-file-header.js","names":["compareArrayBuffers","parseEoCDRecord","CD_COMPRESSED_SIZE_OFFSET","CD_UNCOMPRESSED_SIZE_OFFSET","CD_FILE_NAME_LENGTH_OFFSET","CD_EXTRA_FIELD_LENGTH_OFFSET","CD_LOCAL_HEADER_OFFSET_OFFSET","CD_FILE_NAME_OFFSET","signature","Uint8Array","parseZipCDFileHeader","headerOffset","file","magicBytes","slice","buffer","compressedSize","BigInt","getUint32","uncompressedSize","extraFieldLength","getUint16","fileNameLength","filenameBytes","fileName","TextDecoder","decode","extraOffset","oldFormatOffset","fileDataOffset","offsetInZip64Data","getBigUint64","localHeaderOffset","makeZipCDHeaderIterator","fileProvider","cdStartOffset","cdHeader"],"sources":["../../src/parse-zip/cd-file-header.ts"],"sourcesContent":["import {FileProvider, compareArrayBuffers} from '@loaders.gl/loader-utils';\nimport {parseEoCDRecord} from './end-of-central-directory';\nimport {ZipSignature} from './search-from-the-end';\n\n/**\n * zip central directory file header info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipCDFileHeader = {\n  /** Compressed size */\n  compressedSize: bigint;\n  /** Uncompressed size */\n  uncompressedSize: bigint;\n  /** Extra field size */\n  extraFieldLength: number;\n  /** File name length */\n  fileNameLength: number;\n  /** File name */\n  fileName: string;\n  /** Extra field offset */\n  extraOffset: bigint;\n  /** Relative offset of local file header */\n  localHeaderOffset: bigint;\n};\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_COMPRESSED_SIZE_OFFSET = 20n;\nconst CD_UNCOMPRESSED_SIZE_OFFSET = 24n;\nconst CD_FILE_NAME_LENGTH_OFFSET = 28n;\nconst CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;\nconst CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;\nconst CD_FILE_NAME_OFFSET = 46n;\n\nexport const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);\n\n/**\n * Parses central directory file header of zip file\n * @param headerOffset - offset in the archive where header starts\n * @param buffer - buffer containing whole array\n * @returns Info from the header\n */\nexport const parseZipCDFileHeader = async (\n  headerOffset: bigint,\n  file: FileProvider\n): Promise<ZipCDFileHeader | null> => {\n  const magicBytes = await file.slice(headerOffset, headerOffset + 4n);\n  if (!compareArrayBuffers(magicBytes, signature.buffer)) {\n    return null;\n  }\n\n  let compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));\n  let uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));\n  const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);\n  const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);\n  const filenameBytes = await file.slice(\n    headerOffset + CD_FILE_NAME_OFFSET,\n    headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength)\n  );\n  const fileName = new TextDecoder().decode(filenameBytes);\n\n  const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);\n  const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);\n\n  let fileDataOffset = BigInt(oldFormatOffset);\n  let offsetInZip64Data = 4n;\n  // looking for info that might be also be in zip64 extra field\n  if (uncompressedSize === BigInt(0xffffffff)) {\n    uncompressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);\n    offsetInZip64Data += 8n;\n  }\n  if (compressedSize === BigInt(0xffffffff)) {\n    compressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);\n    offsetInZip64Data += 8n;\n  }\n  if (fileDataOffset === BigInt(0xffffffff)) {\n    fileDataOffset = await file.getBigUint64(extraOffset + offsetInZip64Data); // setting it to the one from zip64\n  }\n  const localHeaderOffset = fileDataOffset;\n\n  return {\n    compressedSize,\n    uncompressedSize,\n    extraFieldLength,\n    fileNameLength,\n    fileName,\n    extraOffset,\n    localHeaderOffset\n  };\n};\n\n/**\n * Create iterator over files of zip archive\n * @param fileProvider - file provider that provider random access to the file\n */\nexport async function* makeZipCDHeaderIterator(\n  fileProvider: FileProvider\n): AsyncIterable<ZipCDFileHeader> {\n  const {cdStartOffset} = await parseEoCDRecord(fileProvider);\n  let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);\n  while (cdHeader) {\n    yield cdHeader;\n    cdHeader = await parseZipCDFileHeader(\n      cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),\n      fileProvider\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"cd-file-header.js","names":["compareArrayBuffers","parseEoCDRecord","CD_COMPRESSED_SIZE_OFFSET","CD_UNCOMPRESSED_SIZE_OFFSET","CD_FILE_NAME_LENGTH_OFFSET","CD_EXTRA_FIELD_LENGTH_OFFSET","CD_START_DISK_OFFSET","CD_LOCAL_HEADER_OFFSET_OFFSET","CD_FILE_NAME_OFFSET","signature","Uint8Array","parseZipCDFileHeader","headerOffset","file","magicBytes","slice","buffer","compressedSize","BigInt","getUint32","uncompressedSize","extraFieldLength","getUint16","startDisk","fileNameLength","filenameBytes","fileName","TextDecoder","decode","extraOffset","oldFormatOffset","localHeaderOffset","extraField","DataView","zip64data","res","findZip64DataInExtra","makeZipCDHeaderIterator","fileProvider","cdStartOffset","cdHeader","arguments","length","undefined","zip64dataList","findExpectedData","zip64DataRes","zip64chunkSize","reduce","sum","curr","offsetInExtraData","findIndex","_val","i","arr","bytesRead","note","offset","name","getBigUint64","push"],"sources":["../../src/parse-zip/cd-file-header.ts"],"sourcesContent":["import {FileProvider, compareArrayBuffers} from '@loaders.gl/loader-utils';\nimport {parseEoCDRecord} from './end-of-central-directory';\nimport {ZipSignature} from './search-from-the-end';\n\n/**\n * zip central directory file header info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipCDFileHeader = {\n  /** Compressed size */\n  compressedSize: bigint;\n  /** Uncompressed size */\n  uncompressedSize: bigint;\n  /** Extra field size */\n  extraFieldLength: number;\n  /** File name length */\n  fileNameLength: number;\n  /** File name */\n  fileName: string;\n  /** Extra field offset */\n  extraOffset: bigint;\n  /** Relative offset of local file header */\n  localHeaderOffset: bigint;\n};\n\n/**\n * Data that might be in Zip64 notation inside extra data\n */\ntype Zip64Data = {\n  /** Uncompressed size */\n  uncompressedSize: bigint;\n  /** Compressed size */\n  compressedSize: bigint;\n  /** Relative offset of local file header */\n  localHeaderOffset: bigint;\n  /** Start disk */\n  startDisk: bigint;\n};\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_COMPRESSED_SIZE_OFFSET = 20n;\nconst CD_UNCOMPRESSED_SIZE_OFFSET = 24n;\nconst CD_FILE_NAME_LENGTH_OFFSET = 28n;\nconst CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;\nconst CD_START_DISK_OFFSET = 32n;\nconst CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;\nconst CD_FILE_NAME_OFFSET = 46n;\n\nexport const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);\n\n/**\n * Parses central directory file header of zip file\n * @param headerOffset - offset in the archive where header starts\n * @param buffer - buffer containing whole array\n * @returns Info from the header\n */\nexport const parseZipCDFileHeader = async (\n  headerOffset: bigint,\n  file: FileProvider\n): Promise<ZipCDFileHeader | null> => {\n  const magicBytes = await file.slice(headerOffset, headerOffset + 4n);\n  if (!compareArrayBuffers(magicBytes, signature.buffer)) {\n    return null;\n  }\n\n  const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));\n  const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));\n  const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);\n  const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));\n  const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);\n  const filenameBytes = await file.slice(\n    headerOffset + CD_FILE_NAME_OFFSET,\n    headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength)\n  );\n  const fileName = new TextDecoder().decode(filenameBytes);\n\n  const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);\n  const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);\n\n  const localHeaderOffset = BigInt(oldFormatOffset);\n  const extraField = new DataView(\n    await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength))\n  );\n  // looking for info that might be also be in zip64 extra field\n\n  const zip64data: Zip64Data = {\n    uncompressedSize,\n    compressedSize,\n    localHeaderOffset,\n    startDisk\n  };\n\n  const res = findZip64DataInExtra(zip64data, extraField);\n\n  return {\n    ...zip64data,\n    ...res,\n    extraFieldLength,\n    fileNameLength,\n    fileName,\n    extraOffset\n  };\n};\n\n/**\n * Create iterator over files of zip archive\n * @param fileProvider - file provider that provider random access to the file\n */\nexport async function* makeZipCDHeaderIterator(\n  fileProvider: FileProvider\n): AsyncIterable<ZipCDFileHeader> {\n  const {cdStartOffset} = await parseEoCDRecord(fileProvider);\n  let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);\n  while (cdHeader) {\n    yield cdHeader;\n    cdHeader = await parseZipCDFileHeader(\n      cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),\n      fileProvider\n    );\n  }\n}\n/**\n * returns the number written in the provided bytes\n * @param bytes two bytes containing the number\n * @returns the number written in the provided bytes\n */\nconst getUint16 = (...bytes: [number, number]) => {\n  return bytes[0] + bytes[1] * 16;\n};\n\n/**\n * reads all nesessary data from zip64 record in the extra data\n * @param zip64data values that might be in zip64 record\n * @param extraField full extra data\n * @returns data read from zip64\n */\n\nconst findZip64DataInExtra = (zip64data: Zip64Data, extraField: DataView): Partial<Zip64Data> => {\n  const zip64dataList = findExpectedData(zip64data);\n\n  const zip64DataRes: Partial<Zip64Data> = {};\n  if (zip64dataList.length > 0) {\n    // total length of data in zip64 notation in bytes\n    const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);\n    // we're looking for the zip64 nontation header (0x0001)\n    // and a size field with a correct value next to it\n    const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex(\n      (_val, i, arr) =>\n        getUint16(arr[i], arr[i + 1]) === 0x0001 &&\n        getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize\n    );\n    // then we read all the nesessary fields from the zip64 data\n    let bytesRead = 0;\n    for (const note of zip64dataList) {\n      const offset = bytesRead;\n      zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);\n      bytesRead = offset + note.length;\n    }\n  }\n\n  return zip64DataRes;\n};\n\n/**\n * frind data that's expected to be in zip64\n * @param zip64data values that might be in zip64 record\n * @returns zip64 data description\n */\n\nconst findExpectedData = (zip64data: Zip64Data): {length: number; name: string}[] => {\n  // We define fields that should be in zip64 data\n  const zip64dataList: {length: number; name: string}[] = [];\n  if (zip64data.uncompressedSize === BigInt(0xffffffff)) {\n    zip64dataList.push({name: 'uncompressedSize', length: 8});\n  }\n  if (zip64data.compressedSize === BigInt(0xffffffff)) {\n    zip64dataList.push({name: 'compressedSize', length: 8});\n  }\n  if (zip64data.localHeaderOffset === BigInt(0xffffffff)) {\n    zip64dataList.push({name: 'localHeaderOffset', length: 8});\n  }\n  if (zip64data.startDisk === BigInt(0xffffffff)) {\n    zip64dataList.push({name: 'startDisk', length: 4});\n  }\n\n  return zip64dataList;\n};\n"],"mappings":"AAAA,SAAsBA,mBAAmB,QAAO,0BAA0B;AAAC,SACnEC,eAAe;AAuCvB,MAAMC,yBAAyB,GAAG,GAAG;AACrC,MAAMC,2BAA2B,GAAG,GAAG;AACvC,MAAMC,0BAA0B,GAAG,GAAG;AACtC,MAAMC,4BAA4B,GAAG,GAAG;AACxC,MAAMC,oBAAoB,GAAG,GAAG;AAChC,MAAMC,6BAA6B,GAAG,GAAG;AACzC,MAAMC,mBAAmB,GAAG,GAAG;AAE/B,OAAO,MAAMC,SAAuB,GAAG,IAAIC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAQ/E,OAAO,MAAMC,oBAAoB,GAAG,MAAAA,CAClCC,YAAoB,EACpBC,IAAkB,KACkB;EACpC,MAAMC,UAAU,GAAG,MAAMD,IAAI,CAACE,KAAK,CAACH,YAAY,EAAEA,YAAY,GAAG,EAAE,CAAC;EACpE,IAAI,CAACZ,mBAAmB,CAACc,UAAU,EAAEL,SAAS,CAACO,MAAM,CAAC,EAAE;IACtD,OAAO,IAAI;EACb;EAEA,MAAMC,cAAc,GAAGC,MAAM,CAAC,MAAML,IAAI,CAACM,SAAS,CAACP,YAAY,GAAGV,yBAAyB,CAAC,CAAC;EAC7F,MAAMkB,gBAAgB,GAAGF,MAAM,CAAC,MAAML,IAAI,CAACM,SAAS,CAACP,YAAY,GAAGT,2BAA2B,CAAC,CAAC;EACjG,MAAMkB,gBAAgB,GAAG,MAAMR,IAAI,CAACS,SAAS,CAACV,YAAY,GAAGP,4BAA4B,CAAC;EAC1F,MAAMkB,SAAS,GAAGL,MAAM,CAAC,MAAML,IAAI,CAACS,SAAS,CAACV,YAAY,GAAGN,oBAAoB,CAAC,CAAC;EACnF,MAAMkB,cAAc,GAAG,MAAMX,IAAI,CAACS,SAAS,CAACV,YAAY,GAAGR,0BAA0B,CAAC;EACtF,MAAMqB,aAAa,GAAG,MAAMZ,IAAI,CAACE,KAAK,CACpCH,YAAY,GAAGJ,mBAAmB,EAClCI,YAAY,GAAGJ,mBAAmB,GAAGU,MAAM,CAACM,cAAc,CAC5D,CAAC;EACD,MAAME,QAAQ,GAAG,IAAIC,WAAW,CAAC,CAAC,CAACC,MAAM,CAACH,aAAa,CAAC;EAExD,MAAMI,WAAW,GAAGjB,YAAY,GAAGJ,mBAAmB,GAAGU,MAAM,CAACM,cAAc,CAAC;EAC/E,MAAMM,eAAe,GAAG,MAAMjB,IAAI,CAACM,SAAS,CAACP,YAAY,GAAGL,6BAA6B,CAAC;EAE1F,MAAMwB,iBAAiB,GAAGb,MAAM,CAACY,eAAe,CAAC;EACjD,MAAME,UAAU,GAAG,IAAIC,QAAQ,CAC7B,MAAMpB,IAAI,CAACE,KAAK,CAACc,WAAW,EAAEA,WAAW,GAAGX,MAAM,CAACG,gBAAgB,CAAC,CACtE,CAAC;EAGD,MAAMa,SAAoB,GAAG;IAC3Bd,gBAAgB;IAChBH,cAAc;IACdc,iBAAiB;IACjBR;EACF,CAAC;EAED,MAAMY,GAAG,GAAGC,oBAAoB,CAACF,SAAS,EAAEF,UAAU,CAAC;EAEvD,OAAO;IACL,GAAGE,SAAS;IACZ,GAAGC,GAAG;IACNd,gBAAgB;IAChBG,cAAc;IACdE,QAAQ;IACRG;EACF,CAAC;AACH,CAAC;AAMD,OAAO,gBAAgBQ,uBAAuBA,CAC5CC,YAA0B,EACM;EAChC,MAAM;IAACC;EAAa,CAAC,GAAG,MAAMtC,eAAe,CAACqC,YAAY,CAAC;EAC3D,IAAIE,QAAQ,GAAG,MAAM7B,oBAAoB,CAAC4B,aAAa,EAAED,YAAY,CAAC;EACtE,OAAOE,QAAQ,EAAE;IACf,MAAMA,QAAQ;IACdA,QAAQ,GAAG,MAAM7B,oBAAoB,CACnC6B,QAAQ,CAACX,WAAW,GAAGX,MAAM,CAACsB,QAAQ,CAACnB,gBAAgB,CAAC,EACxDiB,YACF,CAAC;EACH;AACF;AAMA,MAAMhB,SAAS,GAAG,SAAAA,CAAA,EAAgC;EAChD,OAAO,CAAAmB,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,OAAW,CAAAA,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,OAAW,EAAE;AACjC,CAAC;AASD,MAAML,oBAAoB,GAAGA,CAACF,SAAoB,EAAEF,UAAoB,KAAyB;EAC/F,MAAMY,aAAa,GAAGC,gBAAgB,CAACX,SAAS,CAAC;EAEjD,MAAMY,YAAgC,GAAG,CAAC,CAAC;EAC3C,IAAIF,aAAa,CAACF,MAAM,GAAG,CAAC,EAAE;IAE5B,MAAMK,cAAc,GAAGH,aAAa,CAACI,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAKD,GAAG,GAAGC,IAAI,CAACR,MAAM,EAAE,CAAC,CAAC;IAGhF,MAAMS,iBAAiB,GAAG,IAAIzC,UAAU,CAACsB,UAAU,CAAChB,MAAM,CAAC,CAACoC,SAAS,CACnE,CAACC,IAAI,EAAEC,CAAC,EAAEC,GAAG,KACXjC,SAAS,CAACiC,GAAG,CAACD,CAAC,CAAC,EAAEC,GAAG,CAACD,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,IACxChC,SAAS,CAACiC,GAAG,CAACD,CAAC,GAAG,CAAC,CAAC,EAAEC,GAAG,CAACD,CAAC,GAAG,CAAC,CAAC,CAAC,KAAKP,cAC1C,CAAC;IAED,IAAIS,SAAS,GAAG,CAAC;IACjB,KAAK,MAAMC,IAAI,IAAIb,aAAa,EAAE;MAChC,MAAMc,MAAM,GAAGF,SAAS;MACxBV,YAAY,CAACW,IAAI,CAACE,IAAI,CAAC,GAAG3B,UAAU,CAAC4B,YAAY,CAACT,iBAAiB,GAAG,CAAC,GAAGO,MAAM,EAAE,IAAI,CAAC;MACvFF,SAAS,GAAGE,MAAM,GAAGD,IAAI,CAACf,MAAM;IAClC;EACF;EAEA,OAAOI,YAAY;AACrB,CAAC;AAQD,MAAMD,gBAAgB,GAAIX,SAAoB,IAAuC;EAEnF,MAAMU,aAA+C,GAAG,EAAE;EAC1D,IAAIV,SAAS,CAACd,gBAAgB,KAAKF,MAAM,CAAC,UAAU,CAAC,EAAE;IACrD0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,kBAAkB;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EAC3D;EACA,IAAIR,SAAS,CAACjB,cAAc,KAAKC,MAAM,CAAC,UAAU,CAAC,EAAE;IACnD0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,gBAAgB;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EACzD;EACA,IAAIR,SAAS,CAACH,iBAAiB,KAAKb,MAAM,CAAC,UAAU,CAAC,EAAE;IACtD0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,mBAAmB;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EAC5D;EACA,IAAIR,SAAS,CAACX,SAAS,KAAKL,MAAM,CAAC,UAAU,CAAC,EAAE;IAC9C0B,aAAa,CAACiB,IAAI,CAAC;MAACF,IAAI,EAAE,WAAW;MAAEjB,MAAM,EAAE;IAAC,CAAC,CAAC;EACpD;EAEA,OAAOE,aAAa;AACtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/zip",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.1",
   "description": "Zip Archive Loader",
   "license": "MIT",
   "type": "module",
@@ -38,11 +38,11 @@
     "build-bundle": "ocular-bundle ./src/index.ts"
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.0.0-beta.8",
-    "@loaders.gl/crypto": "4.0.0-beta.8",
-    "@loaders.gl/loader-utils": "4.0.0-beta.8",
+    "@loaders.gl/compression": "4.0.1",
+    "@loaders.gl/crypto": "4.0.1",
+    "@loaders.gl/loader-utils": "4.0.1",
     "jszip": "^3.1.5",
     "md5": "^2.3.0"
   },
-  "gitHead": "ec3d1747b4c01c52a235455d6462680e711b4e19"
+  "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53"
 }

package/src/parse-zip/cd-file-header.ts

@@ -23,11 +23,26 @@ export type ZipCDFileHeader = {
   localHeaderOffset: bigint;
 };
 
+/**
+ * Data that might be in Zip64 notation inside extra data
+ */
+type Zip64Data = {
+  /** Uncompressed size */
+  uncompressedSize: bigint;
+  /** Compressed size */
+  compressedSize: bigint;
+  /** Relative offset of local file header */
+  localHeaderOffset: bigint;
+  /** Start disk */
+  startDisk: bigint;
+};
+
 // offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)
 const CD_COMPRESSED_SIZE_OFFSET = 20n;
 const CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
 const CD_FILE_NAME_LENGTH_OFFSET = 28n;
 const CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;
+const CD_START_DISK_OFFSET = 32n;
 const CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;
 const CD_FILE_NAME_OFFSET = 46n;
 
@@ -48,9 +63,10 @@ export const parseZipCDFileHeader = async (
     return null;
   }
 
-  let compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
-  let uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
+  const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
+  const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
   const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);
+  const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));
   const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);
   const filenameBytes = await file.slice(
     headerOffset + CD_FILE_NAME_OFFSET,
@@ -61,30 +77,28 @@ export const parseZipCDFileHeader = async (
   const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);
   const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);
 
-  let fileDataOffset = BigInt(oldFormatOffset);
-  let offsetInZip64Data = 4n;
+  const localHeaderOffset = BigInt(oldFormatOffset);
+  const extraField = new DataView(
+    await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength))
+  );
   // looking for info that might be also be in zip64 extra field
-  if (uncompressedSize === BigInt(0xffffffff)) {
-    uncompressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
-  }
-  if (compressedSize === BigInt(0xffffffff)) {
-    compressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
-  }
-  if (fileDataOffset === BigInt(0xffffffff)) {
-    fileDataOffset = await file.getBigUint64(extraOffset + offsetInZip64Data); // setting it to the one from zip64
-  }
-  const localHeaderOffset = fileDataOffset;
 
-  return {
-    compressedSize,
+  const zip64data: Zip64Data = {
     uncompressedSize,
+    compressedSize,
+    localHeaderOffset,
+    startDisk
+  };
+
+  const res = findZip64DataInExtra(zip64data, extraField);
+
+  return {
+    ...zip64data,
+    ...res,
     extraFieldLength,
     fileNameLength,
     fileName,
-    extraOffset,
-    localHeaderOffset
+    extraOffset
   };
 };
 
@@ -105,3 +119,69 @@ export async function* makeZipCDHeaderIterator(
     );
   }
 }
+/**
+ * returns the number written in the provided bytes
+ * @param bytes two bytes containing the number
+ * @returns the number written in the provided bytes
+ */
+const getUint16 = (...bytes: [number, number]) => {
+  return bytes[0] + bytes[1] * 16;
+};
+
+/**
+ * reads all nesessary data from zip64 record in the extra data
+ * @param zip64data values that might be in zip64 record
+ * @param extraField full extra data
+ * @returns data read from zip64
+ */
+
+const findZip64DataInExtra = (zip64data: Zip64Data, extraField: DataView): Partial<Zip64Data> => {
+  const zip64dataList = findExpectedData(zip64data);
+
+  const zip64DataRes: Partial<Zip64Data> = {};
+  if (zip64dataList.length > 0) {
+    // total length of data in zip64 notation in bytes
+    const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);
+    // we're looking for the zip64 nontation header (0x0001)
+    // and a size field with a correct value next to it
+    const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex(
+      (_val, i, arr) =>
+        getUint16(arr[i], arr[i + 1]) === 0x0001 &&
+        getUint16(arr[i + 2], arr[i + 3]) === zip64chunkSize
+    );
+    // then we read all the nesessary fields from the zip64 data
+    let bytesRead = 0;
+    for (const note of zip64dataList) {
+      const offset = bytesRead;
+      zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);
+      bytesRead = offset + note.length;
+    }
+  }
+
+  return zip64DataRes;
+};
+
+/**
+ * frind data that's expected to be in zip64
+ * @param zip64data values that might be in zip64 record
+ * @returns zip64 data description
+ */
+
+const findExpectedData = (zip64data: Zip64Data): {length: number; name: string}[] => {
+  // We define fields that should be in zip64 data
+  const zip64dataList: {length: number; name: string}[] = [];
+  if (zip64data.uncompressedSize === BigInt(0xffffffff)) {
+    zip64dataList.push({name: 'uncompressedSize', length: 8});
+  }
+  if (zip64data.compressedSize === BigInt(0xffffffff)) {
+    zip64dataList.push({name: 'compressedSize', length: 8});
+  }
+  if (zip64data.localHeaderOffset === BigInt(0xffffffff)) {
+    zip64dataList.push({name: 'localHeaderOffset', length: 8});
+  }
+  if (zip64data.startDisk === BigInt(0xffffffff)) {
+    zip64dataList.push({name: 'startDisk', length: 4});
+  }
+
+  return zip64dataList;
+};