@loaders.gl/zip 4.1.0-alpha.4 → 4.1.0-alpha.5

package/dist/dist.dev.js

@@ -6956,6 +6956,8 @@ var __exports__ = (() => {
     ZipFileSystem: () => ZipFileSystem,
     ZipLoader: () => ZipLoader,
     ZipWriter: () => ZipWriter,
+    addOneFile: () => addOneFile,
+    composeHashFile: () => composeHashFile,
     generateCDHeader: () => generateCDHeader,
     generateLocalHeader: () => generateLocalHeader,
     localHeaderSignature: () => signature3,
@@ -6970,7 +6972,7 @@ var __exports__ = (() => {
 
   // src/zip-loader.ts
   var import_jszip = __toESM(require_jszip_min(), 1);
-  var VERSION = true ? "4.1.0-alpha.4" : "latest";
+  var VERSION = true ? "4.1.0-alpha.5" : "latest";
   var ZipLoader = {
     id: "zip",
     module: "zip",
@@ -7015,7 +7017,7 @@ var __exports__ = (() => {
 
   // src/zip-writer.ts
   var import_jszip2 = __toESM(require_jszip_min(), 1);
-  var VERSION2 = true ? "4.1.0-alpha.4" : "latest";
+  var VERSION2 = true ? "4.1.0-alpha.5" : "latest";
   var ZipWriter = {
     name: "Zip Archive",
     id: "zip",
@@ -7521,9 +7523,13 @@ var __exports__ = (() => {
   var zip64EoCDLocatorSignature = new Uint8Array([80, 75, 6, 7]);
   var zip64EoCDSignature = new Uint8Array([80, 75, 6, 6]);
   var CD_RECORDS_NUMBER_OFFSET = 8n;
+  var CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;
+  var CD_CD_BYTE_SIZE_OFFSET = 12n;
   var CD_START_OFFSET_OFFSET = 16n;
   var ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
   var ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
+  var ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;
+  var ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;
   var ZIP64_CD_START_OFFSET_OFFSET = 48n;
   var parseEoCDRecord = async (file) => {
     const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
@@ -7553,6 +7559,29 @@ var __exports__ = (() => {
       }
     };
   };
+  async function updateEoCD(eocdBody, oldEoCDOffsets, newCDStartOffset, eocdStartOffset, newCDRecordsNumber) {
+    const eocd = new DataView(eocdBody);
+    const classicEoCDOffset = oldEoCDOffsets.zip64EoCDOffset ? oldEoCDOffsets.zipEoCDOffset - oldEoCDOffsets.zip64EoCDOffset : 0n;
+    if (Number(newCDRecordsNumber) <= 65535) {
+      setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
+      setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);
+    }
+    if (eocdStartOffset - newCDStartOffset <= 4294967295) {
+      setFieldToNumber(eocd, 4, classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);
+    }
+    if (newCDStartOffset < 4294967295) {
+      setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);
+    }
+    if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {
+      const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;
+      setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);
+      setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);
+      setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
+      setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);
+      setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);
+    }
+    return new Uint8Array(eocd.buffer);
+  }
 
   // src/parse-zip/cd-file-header.ts
   var CD_COMPRESSED_SIZE_OFFSET = 20n;
@@ -7888,6 +7917,29 @@ var __exports__ = (() => {
     }
   };
 
+  // ../crypto/src/lib/algorithms/crc32.ts
+  var CRC32 = class {
+    constructor() {
+      this.crc = ~0;
+    }
+    update(arrayBuffer) {
+      const CRC32_TABLE = getCRC32Table();
+      const byteArray = new Uint8Array(arrayBuffer);
+      for (let i = 0; i < byteArray.byteLength; i++) {
+        this.crc = this.crc >>> 8 ^ CRC32_TABLE[(this.crc ^ byteArray[i]) & 255];
+      }
+      return this;
+    }
+    finalize() {
+      this.crc = (this.crc ^ -1) >>> 0;
+      return this.crc;
+    }
+  };
+  var CRC32TAB = Uint32Array.of(0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639, 325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684, 3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665, 651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059, 2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878, 1812370925, 453092731, 2181625025, 4111451223, 1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405, 1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015, 1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989, 3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377, 4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859, 3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669, 829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221, 2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567, 2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836, 1088359270, 936918e3, 2847714899, 3736837829, 1202900863, 817233897, 3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117);
+  function getCRC32Table() {
+    return CRC32TAB;
+  }
+
   // ../crypto/src/lib/utils/base64-utils.ts
   function asciiToBase64(string) {
     string = `${string}`;
@@ -7939,6 +7991,16 @@ var __exports__ = (() => {
   }
 
   // ../crypto/src/lib/utils/digest-utils.ts
+  function encodeNumber(number, encoding) {
+    switch (encoding) {
+      case "hex":
+        return convertNumberToHex(number);
+      case "base64":
+        return convertHexToBase64(convertNumberToHex(number));
+      default:
+        throw new Error(encoding);
+    }
+  }
   function encodeHex(hex, encoding) {
     switch (encoding) {
       case "hex":
@@ -7957,6 +8019,43 @@ var __exports__ = (() => {
     const string = matches2.map((a) => String.fromCharCode(parseInt(a, 16))).join("");
     return asciiToBase64(string) || "";
   }
+  function convertNumberToHex(cipher) {
+    const hexString = cipher.toString(16);
+    return hexString === "0" ? `0${hexString}` : hexString;
+  }
+
+  // ../crypto/src/lib/crc32-hash.ts
+  var CRC32Hash = class extends Hash {
+    name = "crc32";
+    constructor(options = {}) {
+      super();
+      this.options = {
+        crypto: {},
+        ...options
+      };
+      this.hashBatches = this.hashBatches.bind(this);
+    }
+    async hash(input, encoding) {
+      return this.hashSync(input, encoding);
+    }
+    hashSync(input, encoding) {
+      const hash = new CRC32();
+      hash.update(input);
+      const digest = hash.finalize();
+      return encodeNumber(digest, encoding);
+    }
+    async *hashBatches(asyncIterator, encoding = "base64") {
+      const hash = new CRC32();
+      for await (const chunk of asyncIterator) {
+        hash.update(chunk);
+        yield chunk;
+      }
+      const digest = hash.finalize();
+      this.options.crypto?.onEnd?.({
+        hash: encodeNumber(digest, encoding)
+      });
+    }
+  };
 
   // ../crypto/src/lib/algorithms/md5-wasm.ts
   var atb = typeof atob === "function" ? atob : typeof Buffer === "function" ? nodeATOB : identity;
@@ -8381,6 +8480,45 @@ var __exports__ = (() => {
     }
   };
 
+  // src/parse-zip/zip-compozition.ts
+  async function cutTheTailOff(provider) {
+    const oldEoCDinfo = await parseEoCDRecord(provider);
+    const oldCDStartOffset = oldEoCDinfo.cdStartOffset;
+    const oldCDLength = Number(oldEoCDinfo.offsets.zip64EoCDOffset ? oldEoCDinfo.offsets.zip64EoCDOffset - oldCDStartOffset : oldEoCDinfo.offsets.zipEoCDOffset - oldCDStartOffset);
+    const zipEnding = await provider.slice(oldCDStartOffset, provider.length);
+    await provider.truncate(Number(oldCDStartOffset));
+    const oldCDBody = zipEnding.slice(0, oldCDLength);
+    const eocdBody = zipEnding.slice(oldCDLength, zipEnding.byteLength);
+    return [oldCDBody, eocdBody, oldEoCDinfo];
+  }
+  async function generateFileHeaders(fileName, fileToAdd, localFileHeaderOffset) {
+    const newFileCRC322 = parseInt(await new CRC32Hash().hash(fileToAdd, "hex"), 16);
+    const newFileLocalHeader = generateLocalHeader({
+      crc32: newFileCRC322,
+      fileName,
+      length: fileToAdd.byteLength
+    });
+    const newFileCDHeader = generateCDHeader({
+      crc32: newFileCRC322,
+      fileName,
+      offset: localFileHeaderOffset,
+      length: fileToAdd.byteLength
+    });
+    return [new Uint8Array(concatenateArrayBuffers(newFileLocalHeader, fileToAdd)), new Uint8Array(newFileCDHeader)];
+  }
+  async function addOneFile(zipUrl, fileToAdd, fileName) {
+    const provider = new FileHandleFile(zipUrl, true);
+    const [oldCDBody, eocdBody, oldEoCDinfo] = await cutTheTailOff(provider);
+    const newFileOffset = provider.length;
+    const [localPart, cdHeaderPart] = await generateFileHeaders(fileName, fileToAdd, newFileOffset);
+    await provider.append(localPart);
+    const newCDBody = concatenateArrayBuffers(oldCDBody, cdHeaderPart);
+    const newCDStartOffset = provider.length;
+    await provider.append(new Uint8Array(newCDBody));
+    const eocdOffset = provider.length;
+    await provider.append(await updateEoCD(eocdBody, oldEoCDinfo.offsets, newCDStartOffset, eocdOffset, oldEoCDinfo.cdRecordsNumber + 1n));
+  }
+
   // src/hash-file-utility.ts
   function parseHashTable(arrayBuffer) {
     const dataView = new DataView(arrayBuffer);
@@ -8408,6 +8546,23 @@ var __exports__ = (() => {
     }
     return hashTable;
   }
+  async function composeHashFile(fileProvider) {
+    const hashArray = await makeHashTableFromZipHeaders(fileProvider);
+    const bufferArray = Object.entries(hashArray).map(([key, value]) => concatenateArrayBuffers(hexStringToBuffer(key), bigintToBuffer(value))).sort(compareHashes);
+    return concatenateArrayBuffers(...bufferArray);
+  }
+  function compareHashes(arrA, arrB) {
+    const a = new BigUint64Array(arrA);
+    const b = new BigUint64Array(arrB);
+    return Number(a[0] === b[0] ? a[1] - b[1] : a[0] - b[0]);
+  }
+  function hexStringToBuffer(str) {
+    const byteArray = str.match(/../g)?.map((h) => parseInt(h, 16));
+    return new Uint8Array(byteArray ?? new Array(16)).buffer;
+  }
+  function bigintToBuffer(n) {
+    return new BigUint64Array([n]).buffer;
+  }
 
   // ../compression/src/lib/compression.ts
   var Compression = class {

package/dist/hash-file-utility.d.ts

@@ -11,4 +11,10 @@ export declare function parseHashTable(arrayBuffer: ArrayBuffer): Record<string,
  * @returns ready to use hash info
  */
 export declare function makeHashTableFromZipHeaders(fileProvider: FileProvider): Promise<Record<string, bigint>>;
+/**
+ * creates hash file that later can be added to the SLPK archive
+ * @param fileProvider SLPK archive where we need to add hash file
+ * @returns ArrayBuffer containing hash file
+ */
+export declare function composeHashFile(fileProvider: FileProvider): Promise<ArrayBuffer>;
 //# sourceMappingURL=hash-file-utility.d.ts.map

package/dist/hash-file-utility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-file-utility.d.ts","sourceRoot":"","sources":["../src/hash-file-utility.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAGtD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAY/E;AASD;;;;GAIG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAejC"}
+{"version":3,"file":"hash-file-utility.d.ts","sourceRoot":"","sources":["../src/hash-file-utility.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAA0B,MAAM,0BAA0B,CAAC;AAG/E;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAY/E;AASD;;;;GAIG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAejC;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAMtF"}

package/dist/hash-file-utility.js

@@ -1,4 +1,5 @@
 import { MD5Hash } from '@loaders.gl/crypto';
+import { concatenateArrayBuffers } from '@loaders.gl/loader-utils';
 import { makeZipCDHeaderIterator } from "./parse-zip/cd-file-header.js";
 export function parseHashTable(arrayBuffer) {
   const dataView = new DataView(arrayBuffer);
@@ -26,4 +27,25 @@ export async function makeHashTableFromZipHeaders(fileProvider) {
   }
   return hashTable;
 }
+export async function composeHashFile(fileProvider) {
+  const hashArray = await makeHashTableFromZipHeaders(fileProvider);
+  const bufferArray = Object.entries(hashArray).map(_ref => {
+    let [key, value] = _ref;
+    return concatenateArrayBuffers(hexStringToBuffer(key), bigintToBuffer(value));
+  }).sort(compareHashes);
+  return concatenateArrayBuffers(...bufferArray);
+}
+function compareHashes(arrA, arrB) {
+  const a = new BigUint64Array(arrA);
+  const b = new BigUint64Array(arrB);
+  return Number(a[0] === b[0] ? a[1] - b[1] : a[0] - b[0]);
+}
+function hexStringToBuffer(str) {
+  var _str$match;
+  const byteArray = (_str$match = str.match(/../g)) === null || _str$match === void 0 ? void 0 : _str$match.map(h => parseInt(h, 16));
+  return new Uint8Array(byteArray !== null && byteArray !== void 0 ? byteArray : new Array(16)).buffer;
+}
+function bigintToBuffer(n) {
+  return new BigUint64Array([n]).buffer;
+}
 //# sourceMappingURL=hash-file-utility.js.map

package/dist/hash-file-utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash-file-utility.js","names":["MD5Hash","makeZipCDHeaderIterator","parseHashTable","arrayBuffer","dataView","DataView","hashMap","i","byteLength","offset","getBigUint64","hash","bufferToHex","buffer","start","length","Uint8Array","map","x","toString","padStart","join","makeHashTableFromZipHeaders","fileProvider","zipCDIterator","md5Hash","textEncoder","TextEncoder","hashTable","cdHeader","filename","fileName","split","toLocaleLowerCase","encode","md5","localHeaderOffset"],"sources":["../src/hash-file-utility.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport {FileProvider} from '@loaders.gl/loader-utils';\nimport {makeZipCDHeaderIterator} from './parse-zip/cd-file-header';\n\n/**\n * Reads hash file from buffer and returns it in ready-to-use form\n * @param arrayBuffer - buffer containing hash file\n * @returns Map containing hash and offset\n */\nexport function parseHashTable(arrayBuffer: ArrayBuffer): Record<string, bigint> {\n  const dataView = new DataView(arrayBuffer);\n\n  const hashMap: Record<string, bigint> = {};\n\n  for (let i = 0; i < arrayBuffer.byteLength; i = i + 24) {\n    const offset = dataView.getBigUint64(i + 16, true);\n    const hash = bufferToHex(arrayBuffer, i, 16);\n    hashMap[hash] = offset;\n  }\n\n  return hashMap;\n}\n\nfunction bufferToHex(buffer: ArrayBuffer, start: number, length: number): string {\n  // buffer is an ArrayBuffer\n  return [...new Uint8Array(buffer, start, length)]\n    .map((x) => x.toString(16).padStart(2, '0'))\n    .join('');\n}\n\n/**\n * generates hash info from zip files \"central directory\"\n * @param fileProvider - provider of the archive\n * @returns ready to use hash info\n */\nexport async function makeHashTableFromZipHeaders(\n  fileProvider: FileProvider\n): Promise<Record<string, bigint>> {\n  const zipCDIterator = makeZipCDHeaderIterator(fileProvider);\n  const md5Hash = new MD5Hash();\n  const textEncoder = new TextEncoder();\n\n  const hashTable: Record<string, bigint> = {};\n\n  for await (const cdHeader of zipCDIterator) {\n    const filename = cdHeader.fileName.split('\\\\').join('/').toLocaleLowerCase();\n    const arrayBuffer = textEncoder.encode(filename).buffer;\n    const md5 = await md5Hash.hash(arrayBuffer, 'hex');\n    hashTable[md5] = cdHeader.localHeaderOffset;\n  }\n\n  return hashTable;\n}\n"],"mappings":"AAIA,SAAQA,OAAO,QAAO,oBAAoB;AAAC,SAEnCC,uBAAuB;AAO/B,OAAO,SAASC,cAAcA,CAACC,WAAwB,EAA0B;EAC/E,MAAMC,QAAQ,GAAG,IAAIC,QAAQ,CAACF,WAAW,CAAC;EAE1C,MAAMG,OAA+B,GAAG,CAAC,CAAC;EAE1C,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,WAAW,CAACK,UAAU,EAAED,CAAC,GAAGA,CAAC,GAAG,EAAE,EAAE;IACtD,MAAME,MAAM,GAAGL,QAAQ,CAACM,YAAY,CAACH,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC;IAClD,MAAMI,IAAI,GAAGC,WAAW,CAACT,WAAW,EAAEI,CAAC,EAAE,EAAE,CAAC;IAC5CD,OAAO,CAACK,IAAI,CAAC,GAAGF,MAAM;EACxB;EAEA,OAAOH,OAAO;AAChB;AAEA,SAASM,WAAWA,CAACC,MAAmB,EAAEC,KAAa,EAAEC,MAAc,EAAU;EAE/E,OAAO,CAAC,GAAG,IAAIC,UAAU,CAACH,MAAM,EAAEC,KAAK,EAAEC,MAAM,CAAC,CAAC,CAC9CE,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAC3CC,IAAI,CAAC,EAAE,CAAC;AACb;AAOA,OAAO,eAAeC,2BAA2BA,CAC/CC,YAA0B,EACO;EACjC,MAAMC,aAAa,GAAGvB,uBAAuB,CAACsB,YAAY,CAAC;EAC3D,MAAME,OAAO,GAAG,IAAIzB,OAAO,CAAC,CAAC;EAC7B,MAAM0B,WAAW,GAAG,IAAIC,WAAW,CAAC,CAAC;EAErC,MAAMC,SAAiC,GAAG,CAAC,CAAC;EAE5C,WAAW,MAAMC,QAAQ,IAAIL,aAAa,EAAE;IAC1C,MAAMM,QAAQ,GAAGD,QAAQ,CAACE,QAAQ,CAACC,KAAK,CAAC,IAAI,CAAC,CAACX,IAAI,CAAC,GAAG,CAAC,CAACY,iBAAiB,CAAC,CAAC;IAC5E,MAAM9B,WAAW,GAAGuB,WAAW,CAACQ,MAAM,CAACJ,QAAQ,CAAC,CAACjB,MAAM;IACvD,MAAMsB,GAAG,GAAG,MAAMV,OAAO,CAACd,IAAI,CAACR,WAAW,EAAE,KAAK,CAAC;IAClDyB,SAAS,CAACO,GAAG,CAAC,GAAGN,QAAQ,CAACO,iBAAiB;EAC7C;EAEA,OAAOR,SAAS;AAClB"}
+{"version":3,"file":"hash-file-utility.js","names":["MD5Hash","concatenateArrayBuffers","makeZipCDHeaderIterator","parseHashTable","arrayBuffer","dataView","DataView","hashMap","i","byteLength","offset","getBigUint64","hash","bufferToHex","buffer","start","length","Uint8Array","map","x","toString","padStart","join","makeHashTableFromZipHeaders","fileProvider","zipCDIterator","md5Hash","textEncoder","TextEncoder","hashTable","cdHeader","filename","fileName","split","toLocaleLowerCase","encode","md5","localHeaderOffset","composeHashFile","hashArray","bufferArray","Object","entries","_ref","key","value","hexStringToBuffer","bigintToBuffer","sort","compareHashes","arrA","arrB","a","BigUint64Array","b","Number","str","_str$match","byteArray","match","h","parseInt","Array","n"],"sources":["../src/hash-file-utility.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport {FileProvider, concatenateArrayBuffers} from '@loaders.gl/loader-utils';\nimport {makeZipCDHeaderIterator} from './parse-zip/cd-file-header';\n\n/**\n * Reads hash file from buffer and returns it in ready-to-use form\n * @param arrayBuffer - buffer containing hash file\n * @returns Map containing hash and offset\n */\nexport function parseHashTable(arrayBuffer: ArrayBuffer): Record<string, bigint> {\n  const dataView = new DataView(arrayBuffer);\n\n  const hashMap: Record<string, bigint> = {};\n\n  for (let i = 0; i < arrayBuffer.byteLength; i = i + 24) {\n    const offset = dataView.getBigUint64(i + 16, true);\n    const hash = bufferToHex(arrayBuffer, i, 16);\n    hashMap[hash] = offset;\n  }\n\n  return hashMap;\n}\n\nfunction bufferToHex(buffer: ArrayBuffer, start: number, length: number): string {\n  // buffer is an ArrayBuffer\n  return [...new Uint8Array(buffer, start, length)]\n    .map((x) => x.toString(16).padStart(2, '0'))\n    .join('');\n}\n\n/**\n * generates hash info from zip files \"central directory\"\n * @param fileProvider - provider of the archive\n * @returns ready to use hash info\n */\nexport async function makeHashTableFromZipHeaders(\n  fileProvider: FileProvider\n): Promise<Record<string, bigint>> {\n  const zipCDIterator = makeZipCDHeaderIterator(fileProvider);\n  const md5Hash = new MD5Hash();\n  const textEncoder = new TextEncoder();\n\n  const hashTable: Record<string, bigint> = {};\n\n  for await (const cdHeader of zipCDIterator) {\n    const filename = cdHeader.fileName.split('\\\\').join('/').toLocaleLowerCase();\n    const arrayBuffer = textEncoder.encode(filename).buffer;\n    const md5 = await md5Hash.hash(arrayBuffer, 'hex');\n    hashTable[md5] = cdHeader.localHeaderOffset;\n  }\n\n  return hashTable;\n}\n\n/**\n * creates hash file that later can be added to the SLPK archive\n * @param fileProvider SLPK archive where we need to add hash file\n * @returns ArrayBuffer containing hash file\n */\nexport async function composeHashFile(fileProvider: FileProvider): Promise<ArrayBuffer> {\n  const hashArray = await makeHashTableFromZipHeaders(fileProvider);\n  const bufferArray = Object.entries(hashArray)\n    .map(([key, value]) => concatenateArrayBuffers(hexStringToBuffer(key), bigintToBuffer(value)))\n    .sort(compareHashes);\n  return concatenateArrayBuffers(...bufferArray);\n}\n\n/**\n * Function to compare md5 hashes according to https://github.com/Esri/i3s-spec/blob/master/docs/2.0/slpk_hashtable.pcsl.md\n * @param arrA first hash to compare\n * @param arrB second hash to compare\n * @returns 0 if equal, negative number if a<b, pozitive if a>b\n */\nfunction compareHashes(arrA: ArrayBuffer, arrB: ArrayBuffer): number {\n  const a = new BigUint64Array(arrA);\n  const b = new BigUint64Array(arrB);\n\n  return Number(a[0] === b[0] ? a[1] - b[1] : a[0] - b[0]);\n}\n\n/**\n * converts hex string to buffer\n * @param str hex string to convert\n * @returns conversion result\n */\nfunction hexStringToBuffer(str: string): ArrayBuffer {\n  const byteArray = str.match(/../g)?.map((h) => parseInt(h, 16));\n  return new Uint8Array(byteArray ?? new Array(16)).buffer;\n}\n\n/**\n * converts bigint to buffer\n * @param n bigint to convert\n * @returns convertion result\n */\nfunction bigintToBuffer(n: bigint): ArrayBuffer {\n  return new BigUint64Array([n]).buffer;\n}\n"],"mappings":"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"}

package/dist/index.cjs

@@ -35,6 +35,8 @@ __export(src_exports, {
   ZipFileSystem: () => ZipFileSystem,
   ZipLoader: () => ZipLoader,
   ZipWriter: () => ZipWriter,
+  addOneFile: () => addOneFile,
+  composeHashFile: () => composeHashFile,
   generateCDHeader: () => generateCDHeader,
   generateLocalHeader: () => generateLocalHeader,
   localHeaderSignature: () => signature3,
@@ -443,9 +445,13 @@ var eoCDSignature = new Uint8Array([80, 75, 5, 6]);
 var zip64EoCDLocatorSignature = new Uint8Array([80, 75, 6, 7]);
 var zip64EoCDSignature = new Uint8Array([80, 75, 6, 6]);
 var CD_RECORDS_NUMBER_OFFSET = 8n;
+var CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;
+var CD_CD_BYTE_SIZE_OFFSET = 12n;
 var CD_START_OFFSET_OFFSET = 16n;
 var ZIP64_EOCD_START_OFFSET_OFFSET = 8n;
 var ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;
+var ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;
+var ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;
 var ZIP64_CD_START_OFFSET_OFFSET = 48n;
 var parseEoCDRecord = async (file) => {
   const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
@@ -477,6 +483,39 @@ var parseEoCDRecord = async (file) => {
     }
   };
 };
+async function updateEoCD(eocdBody, oldEoCDOffsets, newCDStartOffset, eocdStartOffset, newCDRecordsNumber) {
+  const eocd = new DataView(eocdBody);
+  const classicEoCDOffset = oldEoCDOffsets.zip64EoCDOffset ? oldEoCDOffsets.zipEoCDOffset - oldEoCDOffsets.zip64EoCDOffset : 0n;
+  if (Number(newCDRecordsNumber) <= 65535) {
+    setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
+    setFieldToNumber(
+      eocd,
+      2,
+      classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET,
+      newCDRecordsNumber
+    );
+  }
+  if (eocdStartOffset - newCDStartOffset <= 4294967295) {
+    setFieldToNumber(
+      eocd,
+      4,
+      classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET,
+      eocdStartOffset - newCDStartOffset
+    );
+  }
+  if (newCDStartOffset < 4294967295) {
+    setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);
+  }
+  if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {
+    const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;
+    setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);
+    setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);
+    setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
+    setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);
+    setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);
+  }
+  return new Uint8Array(eocd.buffer);
+}
 
 // src/parse-zip/cd-file-header.ts
 var CD_COMPRESSED_SIZE_OFFSET = 20n;
@@ -857,8 +896,63 @@ var ZIP_HEADER_FIELDS2 = [
   }
 ];
 
-// src/hash-file-utility.ts
+// src/parse-zip/zip-compozition.ts
+var import_loader_utils5 = require("@loaders.gl/loader-utils");
 var import_crypto = require("@loaders.gl/crypto");
+async function cutTheTailOff(provider) {
+  const oldEoCDinfo = await parseEoCDRecord(provider);
+  const oldCDStartOffset = oldEoCDinfo.cdStartOffset;
+  const oldCDLength = Number(
+    oldEoCDinfo.offsets.zip64EoCDOffset ? oldEoCDinfo.offsets.zip64EoCDOffset - oldCDStartOffset : oldEoCDinfo.offsets.zipEoCDOffset - oldCDStartOffset
+  );
+  const zipEnding = await provider.slice(oldCDStartOffset, provider.length);
+  await provider.truncate(Number(oldCDStartOffset));
+  const oldCDBody = zipEnding.slice(0, oldCDLength);
+  const eocdBody = zipEnding.slice(oldCDLength, zipEnding.byteLength);
+  return [oldCDBody, eocdBody, oldEoCDinfo];
+}
+async function generateFileHeaders(fileName, fileToAdd, localFileHeaderOffset) {
+  const newFileCRC322 = parseInt(await new import_crypto.CRC32Hash().hash(fileToAdd, "hex"), 16);
+  const newFileLocalHeader = generateLocalHeader({
+    crc32: newFileCRC322,
+    fileName,
+    length: fileToAdd.byteLength
+  });
+  const newFileCDHeader = generateCDHeader({
+    crc32: newFileCRC322,
+    fileName,
+    offset: localFileHeaderOffset,
+    length: fileToAdd.byteLength
+  });
+  return [
+    new Uint8Array((0, import_loader_utils5.concatenateArrayBuffers)(newFileLocalHeader, fileToAdd)),
+    new Uint8Array(newFileCDHeader)
+  ];
+}
+async function addOneFile(zipUrl, fileToAdd, fileName) {
+  const provider = new import_loader_utils5.FileHandleFile(zipUrl, true);
+  const [oldCDBody, eocdBody, oldEoCDinfo] = await cutTheTailOff(provider);
+  const newFileOffset = provider.length;
+  const [localPart, cdHeaderPart] = await generateFileHeaders(fileName, fileToAdd, newFileOffset);
+  await provider.append(localPart);
+  const newCDBody = (0, import_loader_utils5.concatenateArrayBuffers)(oldCDBody, cdHeaderPart);
+  const newCDStartOffset = provider.length;
+  await provider.append(new Uint8Array(newCDBody));
+  const eocdOffset = provider.length;
+  await provider.append(
+    await updateEoCD(
+      eocdBody,
+      oldEoCDinfo.offsets,
+      newCDStartOffset,
+      eocdOffset,
+      oldEoCDinfo.cdRecordsNumber + 1n
+    )
+  );
+}
+
+// src/hash-file-utility.ts
+var import_crypto2 = require("@loaders.gl/crypto");
+var import_loader_utils6 = require("@loaders.gl/loader-utils");
 function parseHashTable(arrayBuffer) {
   const dataView = new DataView(arrayBuffer);
   const hashMap = {};
@@ -874,7 +968,7 @@ function bufferToHex(buffer, start, length) {
 }
 async function makeHashTableFromZipHeaders(fileProvider) {
   const zipCDIterator = makeZipCDHeaderIterator(fileProvider);
-  const md5Hash = new import_crypto.MD5Hash();
+  const md5Hash = new import_crypto2.MD5Hash();
   const textEncoder = new TextEncoder();
   const hashTable = {};
   for await (const cdHeader of zipCDIterator) {
@@ -885,11 +979,29 @@ async function makeHashTableFromZipHeaders(fileProvider) {
   }
   return hashTable;
 }
+async function composeHashFile(fileProvider) {
+  const hashArray = await makeHashTableFromZipHeaders(fileProvider);
+  const bufferArray = Object.entries(hashArray).map(([key, value]) => (0, import_loader_utils6.concatenateArrayBuffers)(hexStringToBuffer(key), bigintToBuffer(value))).sort(compareHashes);
+  return (0, import_loader_utils6.concatenateArrayBuffers)(...bufferArray);
+}
+function compareHashes(arrA, arrB) {
+  const a = new BigUint64Array(arrA);
+  const b = new BigUint64Array(arrB);
+  return Number(a[0] === b[0] ? a[1] - b[1] : a[0] - b[0]);
+}
+function hexStringToBuffer(str) {
+  var _a;
+  const byteArray = (_a = str.match(/../g)) == null ? void 0 : _a.map((h) => parseInt(h, 16));
+  return new Uint8Array(byteArray ?? new Array(16)).buffer;
+}
+function bigintToBuffer(n) {
+  return new BigUint64Array([n]).buffer;
+}
 
 // src/filesystems/zip-filesystem.ts
-var import_loader_utils5 = require("@loaders.gl/loader-utils");
-var import_loader_utils6 = require("@loaders.gl/loader-utils");
 var import_loader_utils7 = require("@loaders.gl/loader-utils");
+var import_loader_utils8 = require("@loaders.gl/loader-utils");
+var import_loader_utils9 = require("@loaders.gl/loader-utils");
 var import_compression = require("@loaders.gl/compression");
 var COMPRESSION_METHODS = {
   /** No compression */
@@ -911,12 +1023,12 @@ var ZipFileSystem = class {
     this.fileProvider = null;
     if (typeof file === "string") {
       this.fileName = file;
-      if (!import_loader_utils5.isBrowser) {
-        this.fileProvider = new import_loader_utils7.FileHandleFile(file);
+      if (!import_loader_utils7.isBrowser) {
+        this.fileProvider = new import_loader_utils9.FileHandleFile(file);
       } else {
         throw new Error("Cannot open file for random access in a WEB browser");
       }
-    } else if ((0, import_loader_utils6.isFileProvider)(file)) {
+    } else if ((0, import_loader_utils8.isFileProvider)(file)) {
       this.fileProvider = file;
     }
   }

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { parseZipCDFileHeader, makeZipCDHeaderIterator, signature as CD_HEADER_S
 export { parseZipLocalFileHeader, signature as localHeaderSignature, generateLocalHeader } from './parse-zip/local-file-header';
 export { parseEoCDRecord } from './parse-zip/end-of-central-directory';
 export { searchFromTheEnd } from './parse-zip/search-from-the-end';
-export { parseHashTable, makeHashTableFromZipHeaders } from './hash-file-utility';
+export { addOneFile } from './parse-zip/zip-compozition';
+export { parseHashTable, makeHashTableFromZipHeaders, composeHashFile } from './hash-file-utility';
 export { ZipFileSystem } from './filesystems/zip-filesystem';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,SAAS,IAAI,mBAAmB,EAChC,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,uBAAuB,EACvB,SAAS,IAAI,oBAAoB,EACjC,mBAAmB,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAC,cAAc,EAAE,2BAA2B,EAAC,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,SAAS,IAAI,mBAAmB,EAChC,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,uBAAuB,EACvB,SAAS,IAAI,oBAAoB,EACjC,mBAAmB,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAGvD,OAAO,EAAC,cAAc,EAAE,2BAA2B,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAEjG,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC"}

package/dist/index.js

@@ -5,6 +5,7 @@ export { parseZipCDFileHeader, makeZipCDHeaderIterator, signature as CD_HEADER_S
 export { parseZipLocalFileHeader, signature as localHeaderSignature, generateLocalHeader } from "./parse-zip/local-file-header.js";
 export { parseEoCDRecord } from "./parse-zip/end-of-central-directory.js";
 export { searchFromTheEnd } from "./parse-zip/search-from-the-end.js";
-export { parseHashTable, makeHashTableFromZipHeaders } from "./hash-file-utility.js";
+export { addOneFile } from "./parse-zip/zip-compozition.js";
+export { parseHashTable, makeHashTableFromZipHeaders, composeHashFile } from "./hash-file-utility.js";
 export { ZipFileSystem } from "./filesystems/zip-filesystem.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["ZipLoader","ZipWriter","TarBuilder","parseZipCDFileHeader","makeZipCDHeaderIterator","signature","CD_HEADER_SIGNATURE","generateCDHeader","parseZipLocalFileHeader","localHeaderSignature","generateLocalHeader","parseEoCDRecord","searchFromTheEnd","parseHashTable","makeHashTableFromZipHeaders","ZipFileSystem"],"sources":["../src/index.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nexport {ZipLoader} from './zip-loader';\nexport {ZipWriter} from './zip-writer';\nexport {TarBuilder} from './tar-builder';\n\nexport {\n  parseZipCDFileHeader,\n  makeZipCDHeaderIterator,\n  signature as CD_HEADER_SIGNATURE,\n  generateCDHeader\n} from './parse-zip/cd-file-header';\nexport {\n  parseZipLocalFileHeader,\n  signature as localHeaderSignature,\n  generateLocalHeader\n} from './parse-zip/local-file-header';\nexport {parseEoCDRecord} from './parse-zip/end-of-central-directory';\nexport {searchFromTheEnd} from './parse-zip/search-from-the-end';\n\n// export type {HashElement} from './hash-file-utility';\nexport {parseHashTable, makeHashTableFromZipHeaders} from './hash-file-utility';\n\nexport {ZipFileSystem} from './filesystems/zip-filesystem';\n"],"mappings":"SAIQA,SAAS;AAAA,SACTC,SAAS;AAAA,SACTC,UAAU;AAAA,SAGhBC,oBAAoB,EACpBC,uBAAuB,EACvBC,SAAS,IAAIC,mBAAmB,EAChCC,gBAAgB;AAAA,SAGhBC,uBAAuB,EACvBH,SAAS,IAAII,oBAAoB,EACjCC,mBAAmB;AAAA,SAEbC,eAAe;AAAA,SACfC,gBAAgB;AAAA,SAGhBC,cAAc,EAAEC,2BAA2B;AAAA,SAE3CC,aAAa"}
+{"version":3,"file":"index.js","names":["ZipLoader","ZipWriter","TarBuilder","parseZipCDFileHeader","makeZipCDHeaderIterator","signature","CD_HEADER_SIGNATURE","generateCDHeader","parseZipLocalFileHeader","localHeaderSignature","generateLocalHeader","parseEoCDRecord","searchFromTheEnd","addOneFile","parseHashTable","makeHashTableFromZipHeaders","composeHashFile","ZipFileSystem"],"sources":["../src/index.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nexport {ZipLoader} from './zip-loader';\nexport {ZipWriter} from './zip-writer';\nexport {TarBuilder} from './tar-builder';\n\nexport {\n  parseZipCDFileHeader,\n  makeZipCDHeaderIterator,\n  signature as CD_HEADER_SIGNATURE,\n  generateCDHeader\n} from './parse-zip/cd-file-header';\nexport {\n  parseZipLocalFileHeader,\n  signature as localHeaderSignature,\n  generateLocalHeader\n} from './parse-zip/local-file-header';\nexport {parseEoCDRecord} from './parse-zip/end-of-central-directory';\nexport {searchFromTheEnd} from './parse-zip/search-from-the-end';\nexport {addOneFile} from './parse-zip/zip-compozition';\n\n// export type {HashElement} from './hash-file-utility';\nexport {parseHashTable, makeHashTableFromZipHeaders, composeHashFile} from './hash-file-utility';\n\nexport {ZipFileSystem} from './filesystems/zip-filesystem';\n"],"mappings":"SAIQA,SAAS;AAAA,SACTC,SAAS;AAAA,SACTC,UAAU;AAAA,SAGhBC,oBAAoB,EACpBC,uBAAuB,EACvBC,SAAS,IAAIC,mBAAmB,EAChCC,gBAAgB;AAAA,SAGhBC,uBAAuB,EACvBH,SAAS,IAAII,oBAAoB,EACjCC,mBAAmB;AAAA,SAEbC,eAAe;AAAA,SACfC,gBAAgB;AAAA,SAChBC,UAAU;AAAA,SAGVC,cAAc,EAAEC,2BAA2B,EAAEC,eAAe;AAAA,SAE5DC,aAAa"}

package/dist/parse-zip/end-of-central-directory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"end-of-central-directory.d.ts","sourceRoot":"","sources":["../../src/parse-zip/end-of-central-directory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAsB,MAAM,0BAA0B,CAAC;AAI3E;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAiBF;;;;GAIG;AACH,eAAO,MAAM,eAAe,SAAgB,YAAY,KAAG,QAAQ,aAAa,CAmC/E,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,WAAW,EACrB,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,UAAU,CAAC,CAiDrB"}
+{"version":3,"file":"end-of-central-directory.d.ts","sourceRoot":"","sources":["../../src/parse-zip/end-of-central-directory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAsB,MAAM,0BAA0B,CAAC;AAI3E;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAiBF;;;;GAIG;AACH,eAAO,MAAM,eAAe,SAAgB,YAAY,KAAG,QAAQ,aAAa,CAmC/E,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,WAAW,EACrB,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,UAAU,CAAC,CAmDrB"}

package/dist/parse-zip/end-of-central-directory.js

@@ -42,9 +42,8 @@ export const parseEoCDRecord = async file => {
   };
 };
 export async function updateEoCD(eocdBody, oldEoCDOffsets, newCDStartOffset, eocdStartOffset, newCDRecordsNumber) {
-  var _oldEoCDOffsets$zip;
   const eocd = new DataView(eocdBody);
-  const classicEoCDOffset = oldEoCDOffsets.zipEoCDOffset - ((_oldEoCDOffsets$zip = oldEoCDOffsets.zip64EoCDOffset) !== null && _oldEoCDOffsets$zip !== void 0 ? _oldEoCDOffsets$zip : 0n);
+  const classicEoCDOffset = oldEoCDOffsets.zip64EoCDOffset ? oldEoCDOffsets.zipEoCDOffset - oldEoCDOffsets.zip64EoCDOffset : 0n;
   if (Number(newCDRecordsNumber) <= 0xffff) {
     setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);
     setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);

package/dist/parse-zip/end-of-central-directory.js.map

@@ -1 +1 @@
-{"version":3,"file":"end-of-central-directory.js","names":["compareArrayBuffers","searchFromTheEnd","setFieldToNumber","eoCDSignature","Uint8Array","zip64EoCDLocatorSignature","zip64EoCDSignature","CD_RECORDS_NUMBER_OFFSET","CD_RECORDS_NUMBER_ON_DISC_OFFSET","CD_CD_BYTE_SIZE_OFFSET","CD_START_OFFSET_OFFSET","ZIP64_EOCD_START_OFFSET_OFFSET","ZIP64_CD_RECORDS_NUMBER_OFFSET","ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET","ZIP64_CD_CD_BYTE_SIZE_OFFSET","ZIP64_CD_START_OFFSET_OFFSET","parseEoCDRecord","file","zipEoCDOffset","cdRecordsNumber","BigInt","getUint16","cdStartOffset","getUint32","zip64EoCDLocatorOffset","zip64EoCDOffset","magicBytes","slice","getBigUint64","endOfCDMagicBytes","buffer","Error","offsets","updateEoCD","eocdBody","oldEoCDOffsets","newCDStartOffset","eocdStartOffset","newCDRecordsNumber","_oldEoCDOffsets$zip","eocd","DataView","classicEoCDOffset","Number","locatorOffset"],"sources":["../../src/parse-zip/end-of-central-directory.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {FileProvider, compareArrayBuffers} from '@loaders.gl/loader-utils';\nimport {ZipSignature, searchFromTheEnd} from './search-from-the-end';\nimport {setFieldToNumber} from './zip64-info-generation';\n\n/**\n * End of central directory info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipEoCDRecord = {\n  /** Relative offset of local file header */\n  cdStartOffset: bigint;\n  /** Relative offset of local file header */\n  cdRecordsNumber: bigint;\n  offsets: ZipEoCDRecordOffsets;\n};\n\n/**\n * End of central directory offsets\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipEoCDRecordOffsets = {\n  zipEoCDOffset: bigint;\n\n  zip64EoCDOffset?: bigint;\n  zip64EoCDLocatorOffset?: bigint;\n};\n\nconst eoCDSignature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x05, 0x06]);\nconst zip64EoCDLocatorSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x07]);\nconst zip64EoCDSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x06]);\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_RECORDS_NUMBER_OFFSET = 8n;\nconst CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;\nconst CD_CD_BYTE_SIZE_OFFSET = 12n;\nconst CD_START_OFFSET_OFFSET = 16n;\nconst ZIP64_EOCD_START_OFFSET_OFFSET = 8n;\nconst ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;\nconst ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;\nconst ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;\nconst ZIP64_CD_START_OFFSET_OFFSET = 48n;\n\n/**\n * Parses end of central directory record of zip file\n * @param file - FileProvider instance\n * @returns Info from the header\n */\nexport const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord> => {\n  const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);\n\n  let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));\n  let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));\n\n  let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;\n  let zip64EoCDOffset = 0n;\n\n  const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);\n  if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {\n    zip64EoCDOffset = await file.getBigUint64(\n      zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET\n    );\n\n    const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);\n    if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {\n      throw new Error('zip64 EoCD not found');\n    }\n\n    cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);\n    cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);\n  } else {\n    zip64EoCDLocatorOffset = 0n;\n  }\n\n  return {\n    cdRecordsNumber,\n    cdStartOffset,\n    offsets: {\n      zip64EoCDOffset,\n      zip64EoCDLocatorOffset,\n      zipEoCDOffset\n    }\n  };\n};\n\n/**\n * updates EoCD record to add more files to the archieve\n * @param eocdBody buffer containing header\n * @param oldEoCDOffsets info read from EoCD record befor updating\n * @param newCDStartOffset CD start offset to be updated\n * @param eocdStartOffset EoCD start offset to be updated\n * @returns new EoCD header\n */\nexport async function updateEoCD(\n  eocdBody: ArrayBuffer,\n  oldEoCDOffsets: ZipEoCDRecordOffsets,\n  newCDStartOffset: bigint,\n  eocdStartOffset: bigint,\n  newCDRecordsNumber: bigint\n): Promise<Uint8Array> {\n  const eocd = new DataView(eocdBody);\n\n  const classicEoCDOffset = oldEoCDOffsets.zipEoCDOffset - (oldEoCDOffsets.zip64EoCDOffset ?? 0n);\n\n  // updating classic EoCD record with new CD records number in general and on disc\n  if (Number(newCDRecordsNumber) <= 0xffff) {\n    setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);\n    setFieldToNumber(\n      eocd,\n      2,\n      classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET,\n      newCDRecordsNumber\n    );\n  }\n\n  // updating zip64 EoCD record with new size of CD\n  if (eocdStartOffset - newCDStartOffset <= 0xffffffff) {\n    setFieldToNumber(\n      eocd,\n      4,\n      classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET,\n      eocdStartOffset - newCDStartOffset\n    );\n  }\n\n  // updating classic EoCD record with new CD start offset\n  if (newCDStartOffset < 0xffffffff) {\n    setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);\n  }\n\n  // updating zip64 EoCD locator and record with new EoCD record start offset and cd records number\n  if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {\n    // updating zip64 EoCD locator with new EoCD record start offset\n    const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;\n    setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);\n\n    // updating zip64 EoCD record with new cd start offset\n    setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);\n\n    // updating zip64 EoCD record with new cd records number\n    setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);\n    setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);\n\n    // updating zip64 EoCD record with new size of CD\n    setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);\n  }\n\n  return new Uint8Array(eocd.buffer);\n}\n"],"mappings":"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"}
+{"version":3,"file":"end-of-central-directory.js","names":["compareArrayBuffers","searchFromTheEnd","setFieldToNumber","eoCDSignature","Uint8Array","zip64EoCDLocatorSignature","zip64EoCDSignature","CD_RECORDS_NUMBER_OFFSET","CD_RECORDS_NUMBER_ON_DISC_OFFSET","CD_CD_BYTE_SIZE_OFFSET","CD_START_OFFSET_OFFSET","ZIP64_EOCD_START_OFFSET_OFFSET","ZIP64_CD_RECORDS_NUMBER_OFFSET","ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET","ZIP64_CD_CD_BYTE_SIZE_OFFSET","ZIP64_CD_START_OFFSET_OFFSET","parseEoCDRecord","file","zipEoCDOffset","cdRecordsNumber","BigInt","getUint16","cdStartOffset","getUint32","zip64EoCDLocatorOffset","zip64EoCDOffset","magicBytes","slice","getBigUint64","endOfCDMagicBytes","buffer","Error","offsets","updateEoCD","eocdBody","oldEoCDOffsets","newCDStartOffset","eocdStartOffset","newCDRecordsNumber","eocd","DataView","classicEoCDOffset","Number","locatorOffset"],"sources":["../../src/parse-zip/end-of-central-directory.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {FileProvider, compareArrayBuffers} from '@loaders.gl/loader-utils';\nimport {ZipSignature, searchFromTheEnd} from './search-from-the-end';\nimport {setFieldToNumber} from './zip64-info-generation';\n\n/**\n * End of central directory info\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipEoCDRecord = {\n  /** Relative offset of local file header */\n  cdStartOffset: bigint;\n  /** Relative offset of local file header */\n  cdRecordsNumber: bigint;\n  offsets: ZipEoCDRecordOffsets;\n};\n\n/**\n * End of central directory offsets\n * according to https://en.wikipedia.org/wiki/ZIP_(file_format)\n */\nexport type ZipEoCDRecordOffsets = {\n  zipEoCDOffset: bigint;\n\n  zip64EoCDOffset?: bigint;\n  zip64EoCDLocatorOffset?: bigint;\n};\n\nconst eoCDSignature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x05, 0x06]);\nconst zip64EoCDLocatorSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x07]);\nconst zip64EoCDSignature = new Uint8Array([0x50, 0x4b, 0x06, 0x06]);\n\n// offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)\nconst CD_RECORDS_NUMBER_OFFSET = 8n;\nconst CD_RECORDS_NUMBER_ON_DISC_OFFSET = 10n;\nconst CD_CD_BYTE_SIZE_OFFSET = 12n;\nconst CD_START_OFFSET_OFFSET = 16n;\nconst ZIP64_EOCD_START_OFFSET_OFFSET = 8n;\nconst ZIP64_CD_RECORDS_NUMBER_OFFSET = 24n;\nconst ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET = 32n;\nconst ZIP64_CD_CD_BYTE_SIZE_OFFSET = 40n;\nconst ZIP64_CD_START_OFFSET_OFFSET = 48n;\n\n/**\n * Parses end of central directory record of zip file\n * @param file - FileProvider instance\n * @returns Info from the header\n */\nexport const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord> => {\n  const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);\n\n  let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));\n  let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));\n\n  let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;\n  let zip64EoCDOffset = 0n;\n\n  const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);\n  if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {\n    zip64EoCDOffset = await file.getBigUint64(\n      zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET\n    );\n\n    const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);\n    if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {\n      throw new Error('zip64 EoCD not found');\n    }\n\n    cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);\n    cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);\n  } else {\n    zip64EoCDLocatorOffset = 0n;\n  }\n\n  return {\n    cdRecordsNumber,\n    cdStartOffset,\n    offsets: {\n      zip64EoCDOffset,\n      zip64EoCDLocatorOffset,\n      zipEoCDOffset\n    }\n  };\n};\n\n/**\n * updates EoCD record to add more files to the archieve\n * @param eocdBody buffer containing header\n * @param oldEoCDOffsets info read from EoCD record befor updating\n * @param newCDStartOffset CD start offset to be updated\n * @param eocdStartOffset EoCD start offset to be updated\n * @returns new EoCD header\n */\nexport async function updateEoCD(\n  eocdBody: ArrayBuffer,\n  oldEoCDOffsets: ZipEoCDRecordOffsets,\n  newCDStartOffset: bigint,\n  eocdStartOffset: bigint,\n  newCDRecordsNumber: bigint\n): Promise<Uint8Array> {\n  const eocd = new DataView(eocdBody);\n\n  const classicEoCDOffset = oldEoCDOffsets.zip64EoCDOffset\n    ? oldEoCDOffsets.zipEoCDOffset - oldEoCDOffsets.zip64EoCDOffset\n    : 0n;\n\n  // updating classic EoCD record with new CD records number in general and on disc\n  if (Number(newCDRecordsNumber) <= 0xffff) {\n    setFieldToNumber(eocd, 2, classicEoCDOffset + CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);\n    setFieldToNumber(\n      eocd,\n      2,\n      classicEoCDOffset + CD_RECORDS_NUMBER_ON_DISC_OFFSET,\n      newCDRecordsNumber\n    );\n  }\n\n  // updating zip64 EoCD record with new size of CD\n  if (eocdStartOffset - newCDStartOffset <= 0xffffffff) {\n    setFieldToNumber(\n      eocd,\n      4,\n      classicEoCDOffset + CD_CD_BYTE_SIZE_OFFSET,\n      eocdStartOffset - newCDStartOffset\n    );\n  }\n\n  // updating classic EoCD record with new CD start offset\n  if (newCDStartOffset < 0xffffffff) {\n    setFieldToNumber(eocd, 4, classicEoCDOffset + CD_START_OFFSET_OFFSET, newCDStartOffset);\n  }\n\n  // updating zip64 EoCD locator and record with new EoCD record start offset and cd records number\n  if (oldEoCDOffsets.zip64EoCDLocatorOffset && oldEoCDOffsets.zip64EoCDOffset) {\n    // updating zip64 EoCD locator with new EoCD record start offset\n    const locatorOffset = oldEoCDOffsets.zip64EoCDLocatorOffset - oldEoCDOffsets.zip64EoCDOffset;\n    setFieldToNumber(eocd, 8, locatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET, eocdStartOffset);\n\n    // updating zip64 EoCD record with new cd start offset\n    setFieldToNumber(eocd, 8, ZIP64_CD_START_OFFSET_OFFSET, newCDStartOffset);\n\n    // updating zip64 EoCD record with new cd records number\n    setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_OFFSET, newCDRecordsNumber);\n    setFieldToNumber(eocd, 8, ZIP64_CD_RECORDS_NUMBER_ON_DISC_OFFSET, newCDRecordsNumber);\n\n    // updating zip64 EoCD record with new size of CD\n    setFieldToNumber(eocd, 8, ZIP64_CD_CD_BYTE_SIZE_OFFSET, eocdStartOffset - newCDStartOffset);\n  }\n\n  return new Uint8Array(eocd.buffer);\n}\n"],"mappings":"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"}

package/dist/zip-loader.js

@@ -1,5 +1,5 @@
 import JSZip from 'jszip';
-const VERSION = typeof "4.1.0-alpha.4" !== 'undefined' ? "4.1.0-alpha.4" : 'latest';
+const VERSION = typeof "4.1.0-alpha.5" !== 'undefined' ? "4.1.0-alpha.5" : 'latest';
 export const ZipLoader = {
   id: 'zip',
   module: 'zip',

package/dist/zip-writer.js

@@ -1,5 +1,5 @@
 import JSZip from 'jszip';
-const VERSION = typeof "4.1.0-alpha.4" !== 'undefined' ? "4.1.0-alpha.4" : 'latest';
+const VERSION = typeof "4.1.0-alpha.5" !== 'undefined' ? "4.1.0-alpha.5" : 'latest';
 export const ZipWriter = {
   name: 'Zip Archive',
   id: 'zip',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/zip",
-  "version": "4.1.0-alpha.4",
+  "version": "4.1.0-alpha.5",
   "description": "Zip Archive Loader",
   "license": "MIT",
   "type": "module",
@@ -38,11 +38,11 @@
     "build-bundle": "ocular-bundle ./src/index.ts"
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.1.0-alpha.4",
-    "@loaders.gl/crypto": "4.1.0-alpha.4",
-    "@loaders.gl/loader-utils": "4.1.0-alpha.4",
+    "@loaders.gl/compression": "4.1.0-alpha.5",
+    "@loaders.gl/crypto": "4.1.0-alpha.5",
+    "@loaders.gl/loader-utils": "4.1.0-alpha.5",
     "jszip": "^3.1.5",
     "md5": "^2.3.0"
   },
-  "gitHead": "b18ba1d63be704fd021e4470e8ab84175621e62d"
+  "gitHead": "3250842d8cc0fc8b76a575168c1fd57e5a66b6ba"
 }

package/src/hash-file-utility.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {MD5Hash} from '@loaders.gl/crypto';
-import {FileProvider} from '@loaders.gl/loader-utils';
+import {FileProvider, concatenateArrayBuffers} from '@loaders.gl/loader-utils';
 import {makeZipCDHeaderIterator} from './parse-zip/cd-file-header';
 
 /**
@@ -55,3 +55,48 @@ export async function makeHashTableFromZipHeaders(
 
   return hashTable;
 }
+
+/**
+ * creates hash file that later can be added to the SLPK archive
+ * @param fileProvider SLPK archive where we need to add hash file
+ * @returns ArrayBuffer containing hash file
+ */
+export async function composeHashFile(fileProvider: FileProvider): Promise<ArrayBuffer> {
+  const hashArray = await makeHashTableFromZipHeaders(fileProvider);
+  const bufferArray = Object.entries(hashArray)
+    .map(([key, value]) => concatenateArrayBuffers(hexStringToBuffer(key), bigintToBuffer(value)))
+    .sort(compareHashes);
+  return concatenateArrayBuffers(...bufferArray);
+}
+
+/**
+ * Function to compare md5 hashes according to https://github.com/Esri/i3s-spec/blob/master/docs/2.0/slpk_hashtable.pcsl.md
+ * @param arrA first hash to compare
+ * @param arrB second hash to compare
+ * @returns 0 if equal, negative number if a<b, pozitive if a>b
+ */
+function compareHashes(arrA: ArrayBuffer, arrB: ArrayBuffer): number {
+  const a = new BigUint64Array(arrA);
+  const b = new BigUint64Array(arrB);
+
+  return Number(a[0] === b[0] ? a[1] - b[1] : a[0] - b[0]);
+}
+
+/**
+ * converts hex string to buffer
+ * @param str hex string to convert
+ * @returns conversion result
+ */
+function hexStringToBuffer(str: string): ArrayBuffer {
+  const byteArray = str.match(/../g)?.map((h) => parseInt(h, 16));
+  return new Uint8Array(byteArray ?? new Array(16)).buffer;
+}
+
+/**
+ * converts bigint to buffer
+ * @param n bigint to convert
+ * @returns convertion result
+ */
+function bigintToBuffer(n: bigint): ArrayBuffer {
+  return new BigUint64Array([n]).buffer;
+}

package/src/index.ts

@@ -19,8 +19,9 @@ export {
 } from './parse-zip/local-file-header';
 export {parseEoCDRecord} from './parse-zip/end-of-central-directory';
 export {searchFromTheEnd} from './parse-zip/search-from-the-end';
+export {addOneFile} from './parse-zip/zip-compozition';
 
 // export type {HashElement} from './hash-file-utility';
-export {parseHashTable, makeHashTableFromZipHeaders} from './hash-file-utility';
+export {parseHashTable, makeHashTableFromZipHeaders, composeHashFile} from './hash-file-utility';
 
 export {ZipFileSystem} from './filesystems/zip-filesystem';

package/src/parse-zip/end-of-central-directory.ts

@@ -103,7 +103,9 @@ export async function updateEoCD(
 ): Promise<Uint8Array> {
   const eocd = new DataView(eocdBody);
 
-  const classicEoCDOffset = oldEoCDOffsets.zipEoCDOffset - (oldEoCDOffsets.zip64EoCDOffset ?? 0n);
+  const classicEoCDOffset = oldEoCDOffsets.zip64EoCDOffset
+    ? oldEoCDOffsets.zipEoCDOffset - oldEoCDOffsets.zip64EoCDOffset
+    : 0n;
 
   // updating classic EoCD record with new CD records number in general and on disc
   if (Number(newCDRecordsNumber) <= 0xffff) {