@loaders.gl/zip 4.2.1 → 4.3.0-alpha.2

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

@@ -4,11 +4,11 @@
 import { compareArrayBuffers, concatenateArrayBuffers } from '@loaders.gl/loader-utils';
 import { createZip64Info, setFieldToNumber } from "./zip64-info-generation.js";
 // offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)
-const COMPRESSION_METHOD_OFFSET = 8n;
-const COMPRESSED_SIZE_OFFSET = 18n;
-const UNCOMPRESSED_SIZE_OFFSET = 22n;
-const FILE_NAME_LENGTH_OFFSET = 26n;
-const EXTRA_FIELD_LENGTH_OFFSET = 28n;
+const COMPRESSION_METHOD_OFFSET = 8;
+const COMPRESSED_SIZE_OFFSET = 18;
+const UNCOMPRESSED_SIZE_OFFSET = 22;
+const FILE_NAME_LENGTH_OFFSET = 26;
+const EXTRA_FIELD_LENGTH_OFFSET = 28;
 const FILE_NAME_OFFSET = 30n;
 export const signature = new Uint8Array([0x50, 0x4b, 0x03, 0x04]);
 /**
@@ -17,34 +17,34 @@ export const signature = new Uint8Array([0x50, 0x4b, 0x03, 0x04]);
  * @param buffer - buffer containing whole array
  * @returns Info from the header
  */
-export const parseZipLocalFileHeader = async (headerOffset, buffer) => {
-    const magicBytes = await buffer.slice(headerOffset, headerOffset + 4n);
+export const parseZipLocalFileHeader = async (headerOffset, file) => {
+    const mainHeader = new DataView(await file.slice(headerOffset, headerOffset + FILE_NAME_OFFSET));
+    const magicBytes = mainHeader.buffer.slice(0, 4);
     if (!compareArrayBuffers(magicBytes, signature)) {
         return null;
     }
-    const fileNameLength = await buffer.getUint16(headerOffset + FILE_NAME_LENGTH_OFFSET);
-    const fileName = new TextDecoder()
-        .decode(await buffer.slice(headerOffset + FILE_NAME_OFFSET, headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength)))
-        .split('\\')
-        .join('/');
-    const extraFieldLength = await buffer.getUint16(headerOffset + EXTRA_FIELD_LENGTH_OFFSET);
+    const fileNameLength = mainHeader.getUint16(FILE_NAME_LENGTH_OFFSET, true);
+    const extraFieldLength = mainHeader.getUint16(EXTRA_FIELD_LENGTH_OFFSET, true);
+    const additionalHeader = await file.slice(headerOffset + FILE_NAME_OFFSET, headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength + extraFieldLength));
+    const fileNameBuffer = additionalHeader.slice(0, fileNameLength);
+    const extraDataBuffer = new DataView(additionalHeader.slice(fileNameLength, additionalHeader.byteLength));
+    const fileName = new TextDecoder().decode(fileNameBuffer).split('\\').join('/');
     let fileDataOffset = headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength + extraFieldLength);
-    const compressionMethod = await buffer.getUint16(headerOffset + COMPRESSION_METHOD_OFFSET);
-    let compressedSize = BigInt(await buffer.getUint32(headerOffset + COMPRESSED_SIZE_OFFSET)); // add zip 64 logic
-    let uncompressedSize = BigInt(await buffer.getUint32(headerOffset + UNCOMPRESSED_SIZE_OFFSET)); // add zip 64 logic
-    const extraOffset = headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength);
-    let offsetInZip64Data = 4n;
+    const compressionMethod = mainHeader.getUint16(COMPRESSION_METHOD_OFFSET, true);
+    let compressedSize = BigInt(mainHeader.getUint32(COMPRESSED_SIZE_OFFSET, true)); // add zip 64 logic
+    let uncompressedSize = BigInt(mainHeader.getUint32(UNCOMPRESSED_SIZE_OFFSET, true)); // add zip 64 logic
+    let offsetInZip64Data = 4;
     // looking for info that might be also be in zip64 extra field
     if (uncompressedSize === BigInt(0xffffffff)) {
-        uncompressedSize = await buffer.getBigUint64(extraOffset + offsetInZip64Data);
-        offsetInZip64Data += 8n;
+        uncompressedSize = extraDataBuffer.getBigUint64(offsetInZip64Data, true);
+        offsetInZip64Data += 8;
     }
     if (compressedSize === BigInt(0xffffffff)) {
-        compressedSize = await buffer.getBigUint64(extraOffset + offsetInZip64Data);
-        offsetInZip64Data += 8n;
+        compressedSize = extraDataBuffer.getBigUint64(offsetInZip64Data, true);
+        offsetInZip64Data += 8;
     }
     if (fileDataOffset === BigInt(0xffffffff)) {
-        fileDataOffset = await buffer.getBigUint64(extraOffset + offsetInZip64Data); // setting it to the one from zip64
+        fileDataOffset = extraDataBuffer.getBigUint64(offsetInZip64Data, true); // setting it to the one from zip64
     }
     return {
         fileNameLength,

package/dist/parse-zip/search-from-the-end.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-from-the-end.d.ts","sourceRoot":"","sources":["../../src/parse-zip/search-from-the-end.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAEtD,wCAAwC;AACxC,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC;AAEtC;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,SACrB,YAAY,UACV,YAAY,KACnB,QAAQ,MAAM,CAuBhB,CAAC"}
+{"version":3,"file":"search-from-the-end.d.ts","sourceRoot":"","sources":["../../src/parse-zip/search-from-the-end.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAEtD,wCAAwC;AACxC,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC;AAItC;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,SACrB,YAAY,UACV,YAAY,KACnB,QAAQ,MAAM,CA8BhB,CAAC"}

package/dist/parse-zip/search-from-the-end.js

@@ -1,6 +1,7 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+const buffLength = 1024;
 /**
  * looking for the last occurrence of the provided
  * @param file
@@ -14,17 +15,24 @@ export const searchFromTheEnd = async (file, target) => {
         await file.getUint8(file.length - 3n),
         undefined
     ];
-    let targetOffset = 0n;
+    let targetOffset = -1;
     // looking for the last record in the central directory
-    for (let i = file.length - 4n; i > -1; i--) {
-        searchWindow[3] = searchWindow[2];
-        searchWindow[2] = searchWindow[1];
-        searchWindow[1] = searchWindow[0];
-        searchWindow[0] = await file.getUint8(i);
-        if (searchWindow.every((val, index) => val === target[index])) {
-            targetOffset = i;
-            break;
+    let point = file.length - 4n;
+    do {
+        const prevPoint = point;
+        point -= BigInt(buffLength);
+        point = point >= 0n ? point : 0n;
+        const buff = new Uint8Array(await file.slice(point, prevPoint));
+        for (let i = buff.length - 1; i > -1; i--) {
+            searchWindow[3] = searchWindow[2];
+            searchWindow[2] = searchWindow[1];
+            searchWindow[1] = searchWindow[0];
+            searchWindow[0] = buff[i];
+            if (searchWindow.every((val, index) => val === target[index])) {
+                targetOffset = i;
+                break;
+            }
         }
-    }
-    return targetOffset;
+    } while (targetOffset === -1 && point > 0n);
+    return point + BigInt(targetOffset);
 };

package/dist/zip-loader.js

@@ -4,7 +4,7 @@
 import JSZip from 'jszip';
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0" !== 'undefined' ? "4.2.0" : 'latest';
+const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
 export const ZipLoader = {
     dataType: null,
     batchType: null,

package/dist/zip-writer.js

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 import JSZip from 'jszip';
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0" !== 'undefined' ? "4.2.0" : 'latest';
+const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
 /**
  * Zip exporter
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/zip",
-  "version": "4.2.1",
+  "version": "4.3.0-alpha.2",
   "description": "Zip Archive Loader",
   "license": "MIT",
   "type": "module",
@@ -39,14 +39,14 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.2.1",
-    "@loaders.gl/crypto": "4.2.1",
-    "@loaders.gl/loader-utils": "4.2.1",
+    "@loaders.gl/compression": "4.3.0-alpha.2",
+    "@loaders.gl/crypto": "4.3.0-alpha.2",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.2",
     "jszip": "^3.1.5",
     "md5": "^2.3.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "b2ea799ff9f233ab8af0a6c3696e28ddf6e3c5a3"
+  "gitHead": "77a3cb538ab7a1fbf74245f25590210451689f5c"
 }

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

@@ -2,7 +2,12 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {FileProvider, compareArrayBuffers, concatenateArrayBuffers} from '@loaders.gl/loader-utils';
+import {
+  DataViewFile,
+  FileProvider,
+  compareArrayBuffers,
+  concatenateArrayBuffers
+} from '@loaders.gl/loader-utils';
 import {parseEoCDRecord} from './end-of-central-directory';
 import {ZipSignature} from './search-from-the-end';
 import {createZip64Info, setFieldToNumber} from './zip64-info-generation';
@@ -43,12 +48,12 @@ type Zip64Data = {
 };
 
 // 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_COMPRESSED_SIZE_OFFSET = 20;
+const CD_UNCOMPRESSED_SIZE_OFFSET = 24;
+const CD_FILE_NAME_LENGTH_OFFSET = 28;
+const CD_EXTRA_FIELD_LENGTH_OFFSET = 30;
+const CD_START_DISK_OFFSET = 32;
+const CD_LOCAL_HEADER_OFFSET_OFFSET = 42;
 const CD_FILE_NAME_OFFSET = 46n;
 
 export const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);
@@ -63,28 +68,38 @@ export const parseZipCDFileHeader = async (
   headerOffset: bigint,
   file: FileProvider
 ): Promise<ZipCDFileHeader | null> => {
-  const magicBytes = await file.slice(headerOffset, headerOffset + 4n);
+  if (headerOffset >= file.length) {
+    return null;
+  }
+  const mainHeader = new DataView(
+    await file.slice(headerOffset, headerOffset + CD_FILE_NAME_OFFSET)
+  );
+
+  const magicBytes = mainHeader.buffer.slice(0, 4);
   if (!compareArrayBuffers(magicBytes, signature.buffer)) {
     return null;
   }
 
-  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(
+  const compressedSize = BigInt(mainHeader.getUint32(CD_COMPRESSED_SIZE_OFFSET, true));
+  const uncompressedSize = BigInt(mainHeader.getUint32(CD_UNCOMPRESSED_SIZE_OFFSET, true));
+  const extraFieldLength = mainHeader.getUint16(CD_EXTRA_FIELD_LENGTH_OFFSET, true);
+  const startDisk = BigInt(mainHeader.getUint16(CD_START_DISK_OFFSET, true));
+  const fileNameLength = mainHeader.getUint16(CD_FILE_NAME_LENGTH_OFFSET, true);
+
+  const additionalHeader = await file.slice(
     headerOffset + CD_FILE_NAME_OFFSET,
-    headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength)
+    headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength + extraFieldLength)
   );
+
+  const filenameBytes = additionalHeader.slice(0, 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);
+  const oldFormatOffset = mainHeader.getUint32(CD_LOCAL_HEADER_OFFSET_OFFSET, true);
 
   const localHeaderOffset = BigInt(oldFormatOffset);
   const extraField = new DataView(
-    await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength))
+    additionalHeader.slice(fileNameLength, additionalHeader.byteLength)
   );
   // looking for info that might be also be in zip64 extra field
 
@@ -114,13 +129,16 @@ export const parseZipCDFileHeader = async (
 export async function* makeZipCDHeaderIterator(
   fileProvider: FileProvider
 ): AsyncIterable<ZipCDFileHeader> {
-  const {cdStartOffset} = await parseEoCDRecord(fileProvider);
-  let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);
+  const {cdStartOffset, cdByteSize} = await parseEoCDRecord(fileProvider);
+  const centralDirectory = new DataViewFile(
+    new DataView(await fileProvider.slice(cdStartOffset, cdStartOffset + cdByteSize))
+  );
+  let cdHeader = await parseZipCDFileHeader(0n, centralDirectory);
   while (cdHeader) {
     yield cdHeader;
     cdHeader = await parseZipCDFileHeader(
       cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),
-      fileProvider
+      centralDirectory
     );
   }
 }

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

@@ -11,10 +11,12 @@ import {setFieldToNumber} from './zip64-info-generation';
  * according to https://en.wikipedia.org/wiki/ZIP_(file_format)
  */
 export type ZipEoCDRecord = {
-  /** Relative offset of local file header */
+  /** Relative offset of cd start */
   cdStartOffset: bigint;
-  /** Relative offset of local file header */
+  /** Total number of central directory records */
   cdRecordsNumber: bigint;
+  /** Size of central directory */
+  cdByteSize: bigint;
   offsets: ZipEoCDRecordOffsets;
 };
 
@@ -66,6 +68,7 @@ export const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord
   const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
 
   let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
+  let cdByteSize = BigInt(await file.getUint32(zipEoCDOffset + CD_CD_BYTE_SIZE_OFFSET));
   let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
 
   let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
@@ -83,6 +86,7 @@ export const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord
     }
 
     cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
+    cdByteSize = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_CD_BYTE_SIZE_OFFSET);
     cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
   } else {
     zip64EoCDLocatorOffset = 0n;
@@ -91,6 +95,7 @@ export const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord
   return {
     cdRecordsNumber,
     cdStartOffset,
+    cdByteSize,
     offsets: {
       zip64EoCDOffset,
       zip64EoCDLocatorOffset,

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

@@ -26,11 +26,11 @@ export type ZipLocalFileHeader = {
 };
 
 // offsets accroding to https://en.wikipedia.org/wiki/ZIP_(file_format)
-const COMPRESSION_METHOD_OFFSET = 8n;
-const COMPRESSED_SIZE_OFFSET = 18n;
-const UNCOMPRESSED_SIZE_OFFSET = 22n;
-const FILE_NAME_LENGTH_OFFSET = 26n;
-const EXTRA_FIELD_LENGTH_OFFSET = 28n;
+const COMPRESSION_METHOD_OFFSET = 8;
+const COMPRESSED_SIZE_OFFSET = 18;
+const UNCOMPRESSED_SIZE_OFFSET = 22;
+const FILE_NAME_LENGTH_OFFSET = 26;
+const EXTRA_FIELD_LENGTH_OFFSET = 28;
 const FILE_NAME_OFFSET = 30n;
 
 export const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x03, 0x04]);
@@ -43,48 +43,52 @@ export const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x03, 0x04]);
  */
 export const parseZipLocalFileHeader = async (
   headerOffset: bigint,
-  buffer: FileProvider
+  file: FileProvider
 ): Promise<ZipLocalFileHeader | null> => {
-  const magicBytes = await buffer.slice(headerOffset, headerOffset + 4n);
+  const mainHeader = new DataView(await file.slice(headerOffset, headerOffset + FILE_NAME_OFFSET));
+
+  const magicBytes = mainHeader.buffer.slice(0, 4);
   if (!compareArrayBuffers(magicBytes, signature)) {
     return null;
   }
 
-  const fileNameLength = await buffer.getUint16(headerOffset + FILE_NAME_LENGTH_OFFSET);
+  const fileNameLength = mainHeader.getUint16(FILE_NAME_LENGTH_OFFSET, true);
 
-  const fileName = new TextDecoder()
-    .decode(
-      await buffer.slice(
-        headerOffset + FILE_NAME_OFFSET,
-        headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength)
-      )
-    )
-    .split('\\')
-    .join('/');
-  const extraFieldLength = await buffer.getUint16(headerOffset + EXTRA_FIELD_LENGTH_OFFSET);
+  const extraFieldLength = mainHeader.getUint16(EXTRA_FIELD_LENGTH_OFFSET, true);
 
-  let fileDataOffset = headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength + extraFieldLength);
+  const additionalHeader = await file.slice(
+    headerOffset + FILE_NAME_OFFSET,
+    headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength + extraFieldLength)
+  );
+
+  const fileNameBuffer = additionalHeader.slice(0, fileNameLength);
 
-  const compressionMethod = await buffer.getUint16(headerOffset + COMPRESSION_METHOD_OFFSET);
+  const extraDataBuffer = new DataView(
+    additionalHeader.slice(fileNameLength, additionalHeader.byteLength)
+  );
+
+  const fileName = new TextDecoder().decode(fileNameBuffer).split('\\').join('/');
+
+  let fileDataOffset = headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength + extraFieldLength);
 
-  let compressedSize = BigInt(await buffer.getUint32(headerOffset + COMPRESSED_SIZE_OFFSET)); // add zip 64 logic
+  const compressionMethod = mainHeader.getUint16(COMPRESSION_METHOD_OFFSET, true);
 
-  let uncompressedSize = BigInt(await buffer.getUint32(headerOffset + UNCOMPRESSED_SIZE_OFFSET)); // add zip 64 logic
+  let compressedSize = BigInt(mainHeader.getUint32(COMPRESSED_SIZE_OFFSET, true)); // add zip 64 logic
 
-  const extraOffset = headerOffset + FILE_NAME_OFFSET + BigInt(fileNameLength);
+  let uncompressedSize = BigInt(mainHeader.getUint32(UNCOMPRESSED_SIZE_OFFSET, true)); // add zip 64 logic
 
-  let offsetInZip64Data = 4n;
+  let offsetInZip64Data = 4;
   // looking for info that might be also be in zip64 extra field
   if (uncompressedSize === BigInt(0xffffffff)) {
-    uncompressedSize = await buffer.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
+    uncompressedSize = extraDataBuffer.getBigUint64(offsetInZip64Data, true);
+    offsetInZip64Data += 8;
   }
   if (compressedSize === BigInt(0xffffffff)) {
-    compressedSize = await buffer.getBigUint64(extraOffset + offsetInZip64Data);
-    offsetInZip64Data += 8n;
+    compressedSize = extraDataBuffer.getBigUint64(offsetInZip64Data, true);
+    offsetInZip64Data += 8;
   }
   if (fileDataOffset === BigInt(0xffffffff)) {
-    fileDataOffset = await buffer.getBigUint64(extraOffset + offsetInZip64Data); // setting it to the one from zip64
+    fileDataOffset = extraDataBuffer.getBigUint64(offsetInZip64Data, true); // setting it to the one from zip64
   }
 
   return {

package/src/parse-zip/search-from-the-end.ts

@@ -7,6 +7,8 @@ import {FileProvider} from '@loaders.gl/loader-utils';
 /** Description of zip signature type */
 export type ZipSignature = Uint8Array;
 
+const buffLength = 1024;
+
 /**
  * looking for the last occurrence of the provided
  * @param file
@@ -24,19 +26,26 @@ export const searchFromTheEnd = async (
     undefined
   ];
 
-  let targetOffset = 0n;
+  let targetOffset = -1;
 
   // looking for the last record in the central directory
-  for (let i = file.length - 4n; i > -1; i--) {
-    searchWindow[3] = searchWindow[2];
-    searchWindow[2] = searchWindow[1];
-    searchWindow[1] = searchWindow[0];
-    searchWindow[0] = await file.getUint8(i);
-    if (searchWindow.every((val, index) => val === target[index])) {
-      targetOffset = i;
-      break;
+  let point = file.length - 4n;
+  do {
+    const prevPoint = point;
+    point -= BigInt(buffLength);
+    point = point >= 0n ? point : 0n;
+    const buff = new Uint8Array(await file.slice(point, prevPoint));
+    for (let i = buff.length - 1; i > -1; i--) {
+      searchWindow[3] = searchWindow[2];
+      searchWindow[2] = searchWindow[1];
+      searchWindow[1] = searchWindow[0];
+      searchWindow[0] = buff[i];
+      if (searchWindow.every((val, index) => val === target[index])) {
+        targetOffset = i;
+        break;
+      }
     }
-  }
+  } while (targetOffset === -1 && point > 0n);
 
-  return targetOffset;
+  return point + BigInt(targetOffset);
 };