@loaders.gl/i3s 4.0.0-alpha.15 → 4.0.0-alpha.17

package/dist/i3s-content-worker.js

@@ -55,7 +55,7 @@
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.15" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.17" : DEFAULT_VERSION;
   if (false) {
     console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
   }
@@ -1191,16 +1191,12 @@
   }
 
   // ../core/src/lib/fetch/fetch-file.ts
-  async function fetchFile(url, options) {
-    if (typeof url === "string") {
-      url = resolvePath(url);
-      let fetchOptions = options;
-      if (options?.fetch && typeof options?.fetch !== "function") {
-        fetchOptions = options.fetch;
-      }
+  async function fetchFile(urlOrData, fetchOptions) {
+    if (typeof urlOrData === "string") {
+      const url = resolvePath(urlOrData);
       return await fetch(url, fetchOptions);
     }
-    return await makeResponse(url);
+    return await makeResponse(urlOrData);
   }
 
   // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/is-electron.js
@@ -1234,7 +1230,7 @@
   var navigator_ = globalThis.navigator || {};
 
   // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/utils/globals.js
-  var VERSION3 = true ? "4.0.0-alpha.15" : "untranspiled source";
+  var VERSION3 = true ? "4.0.0-alpha.17" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -4582,7 +4578,7 @@
   _defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
 
   // ../images/src/lib/utils/version.ts
-  var VERSION4 = true ? "4.0.0-alpha.15" : "latest";
+  var VERSION4 = true ? "4.0.0-alpha.17" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -4979,7 +4975,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0-alpha.15" : "latest";
+  var VERSION5 = true ? "4.0.0-alpha.17" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5524,10 +5520,10 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.0.0-alpha.15" : "beta";
+  var VERSION6 = true ? "4.0.0-alpha.17" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
-  var VERSION7 = true ? "4.0.0-alpha.15" : "beta";
+  var VERSION7 = true ? "4.0.0-alpha.17" : "beta";
   var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION7}/dist/libs/basis_encoder.wasm`;
   var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION7}/dist/libs/basis_encoder.js`;
   var loadBasisTranscoderPromise;
@@ -6470,18 +6466,6 @@
   };
 
   // src/types.ts
-  var DATA_TYPE;
-  (function(DATA_TYPE2) {
-    DATA_TYPE2["UInt8"] = "UInt8";
-    DATA_TYPE2["UInt16"] = "UInt16";
-    DATA_TYPE2["UInt32"] = "UInt32";
-    DATA_TYPE2["UInt64"] = "UInt64";
-    DATA_TYPE2["Int16"] = "Int16";
-    DATA_TYPE2["Int32"] = "Int32";
-    DATA_TYPE2["Int64"] = "Int64";
-    DATA_TYPE2["Float32"] = "Float32";
-    DATA_TYPE2["Float64"] = "Float64";
-  })(DATA_TYPE || (DATA_TYPE = {}));
   var HeaderAttributeProperty;
   (function(HeaderAttributeProperty2) {
     HeaderAttributeProperty2["vertexCount"] = "vertexCount";
@@ -7114,15 +7098,15 @@
   // src/lib/parsers/constants.ts
   function getConstructorForDataFormat(dataType) {
     switch (dataType) {
-      case DATA_TYPE.UInt8:
+      case "UInt8":
         return Uint8Array;
-      case DATA_TYPE.UInt16:
+      case "UInt16":
         return Uint16Array;
-      case DATA_TYPE.UInt32:
+      case "UInt32":
         return Uint32Array;
-      case DATA_TYPE.Float32:
+      case "Float32":
         return Float32Array;
-      case DATA_TYPE.UInt64:
+      case "UInt64":
         return Float64Array;
       default:
         throw new Error(`parse i3s tile content: unknown type of data: ${dataType}`);
@@ -7137,18 +7121,18 @@
   };
   function sizeOf(dataType) {
     switch (dataType) {
-      case DATA_TYPE.UInt8:
+      case "UInt8":
         return 1;
-      case DATA_TYPE.UInt16:
-      case DATA_TYPE.Int16:
+      case "UInt16":
+      case "Int16":
         return 2;
-      case DATA_TYPE.UInt32:
-      case DATA_TYPE.Int32:
-      case DATA_TYPE.Float32:
+      case "UInt32":
+      case "Int32":
+      case "Float32":
         return 4;
-      case DATA_TYPE.UInt64:
-      case DATA_TYPE.Int64:
-      case DATA_TYPE.Float64:
+      case "UInt64":
+      case "Int64":
+      case "Float64":
         return 8;
       default:
         throw new Error(`parse i3s tile content: unknown size of data: ${dataType}`);
@@ -7225,7 +7209,7 @@
   }
 
   // src/i3s-attribute-loader.ts
-  var VERSION8 = true ? "4.0.0-alpha.15" : "latest";
+  var VERSION8 = true ? "4.0.0-alpha.17" : "latest";
   var I3SAttributeLoader = {
     name: "I3S Attribute",
     id: "i3s-attribute",
@@ -7688,7 +7672,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION9 = true ? "4.0.0-alpha.15" : "beta";
+  var VERSION9 = true ? "4.0.0-alpha.17" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type { BoundingVolumes, Mbs, Obb, SceneLayer3D, AttributeStorageInfo, Field, ESRIField, PopupInfo, Node3DIndexDocument, LodSelection, NodeReference, Resource, MaxScreenThresholdSQ, NodeInPage, SharedResources, Attribute, Extent, FeatureAttribute, FieldInfo, I3SMaterialDefinition, TextureDefinitionInfo, MaterialDefinitionInfo, FullExtent, StatisticsInfo, StatsInfo, Histogram, ValueCount, BuildingSceneSublayer, DATA_TYPE, OperationalLayer, TextureSetDefinitionFormats } from './types';
+export type { BoundingVolumes, Mbs, Obb, SceneLayer3D, AttributeStorageInfo, Field, ESRIField, PopupInfo, Node3DIndexDocument, LodSelection, NodeReference, Resource, MaxScreenThresholdSQ, NodeInPage, SharedResources, Attribute, Extent, FeatureAttribute, FieldInfo, I3SMaterialDefinition, TextureDefinitionInfo, MaterialDefinitionInfo, FullExtent, StatisticsInfo, StatsInfo, Histogram, ValueCount, BuildingSceneSublayer, OperationalLayer, TextureSetDefinitionFormats } from './types';
 export type { FileProvider } from './lib/parsers/parse-zip/file-provider';
 export { COORDINATE_SYSTEM } from './lib/parsers/constants';
 export { I3SLoader } from './i3s-loader';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,YAAY,EACV,eAAe,EACf,GAAG,EACH,GAAG,EACH,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,cAAc,EACd,SAAS,EACT,SAAS,EACT,UAAU,EACV,qBAAqB,EACrB,SAAS,EACT,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AACjB,YAAY,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAC,uBAAuB,EAAC,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,YAAY,EACV,eAAe,EACf,GAAG,EACH,GAAG,EACH,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,cAAc,EACd,SAAS,EACT,SAAS,EACT,UAAU,EACV,qBAAqB,EACrB,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AACjB,YAAY,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAC,uBAAuB,EAAC,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC"}

package/dist/lib/parsers/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/constants.ts"],"names":[],"mappings":"AAGA,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,+HAe3D;AAED,eAAO,MAAM,WAAW,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAM/C,CAAC;AACF;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkB/C;AAED,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAC9C,eAAO,MAAM,wBAAwB,UAAU,CAAC;AAChD,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAI7C,oBAAY,iBAAiB;IAC3B;;OAEG;IACH,OAAO,KAAK;IACZ;;;OAGG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,aAAa,IAAI;IACjB;;;;OAIG;IACH,cAAc,IAAI;IAClB;;OAEG;IACH,SAAS,IAAI;CACd"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/constants.ts"],"names":[],"mappings":"AAEA,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,+HAe3D;AAED,eAAO,MAAM,WAAW,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAM/C,CAAC;AACF;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAkB/C;AAED,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAC9C,eAAO,MAAM,wBAAwB,UAAU,CAAC;AAChD,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAI7C,oBAAY,iBAAiB;IAC3B;;OAEG;IACH,OAAO,KAAK;IACZ;;;OAGG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,aAAa,IAAI;IACjB;;;;OAIG;IACH,cAAc,IAAI;IAClB;;OAEG;IACH,SAAS,IAAI;CACd"}

package/dist/lib/parsers/constants.js

@@ -5,18 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COORDINATE_SYSTEM = exports.INT_16_ATTRIBUTE_TYPE = exports.FLOAT_64_TYPE = exports.OBJECT_ID_ATTRIBUTE_TYPE = exports.STRING_ATTRIBUTE_TYPE = exports.sizeOf = exports.GL_TYPE_MAP = exports.getConstructorForDataFormat = void 0;
 const constants_1 = __importDefault(require("@luma.gl/constants"));
-const types_1 = require("../../types");
 function getConstructorForDataFormat(dataType) {
     switch (dataType) {
-        case types_1.DATA_TYPE.UInt8:
+        case 'UInt8':
             return Uint8Array;
-        case types_1.DATA_TYPE.UInt16:
+        case 'UInt16':
             return Uint16Array;
-        case types_1.DATA_TYPE.UInt32:
+        case 'UInt32':
             return Uint32Array;
-        case types_1.DATA_TYPE.Float32:
+        case 'Float32':
             return Float32Array;
-        case types_1.DATA_TYPE.UInt64:
+        case 'UInt64':
             return Float64Array;
         default:
             throw new Error(`parse i3s tile content: unknown type of data: ${dataType}`);
@@ -37,18 +36,18 @@ exports.GL_TYPE_MAP = {
  */
 function sizeOf(dataType) {
     switch (dataType) {
-        case types_1.DATA_TYPE.UInt8:
+        case 'UInt8':
             return 1;
-        case types_1.DATA_TYPE.UInt16:
-        case types_1.DATA_TYPE.Int16:
+        case 'UInt16':
+        case 'Int16':
             return 2;
-        case types_1.DATA_TYPE.UInt32:
-        case types_1.DATA_TYPE.Int32:
-        case types_1.DATA_TYPE.Float32:
+        case 'UInt32':
+        case 'Int32':
+        case 'Float32':
             return 4;
-        case types_1.DATA_TYPE.UInt64:
-        case types_1.DATA_TYPE.Int64:
-        case types_1.DATA_TYPE.Float64:
+        case 'UInt64':
+        case 'Int64':
+        case 'Float64':
             return 8;
         default:
             throw new Error(`parse i3s tile content: unknown size of data: ${dataType}`);

package/dist/lib/parsers/parse-slpk/parse-slpk.d.ts

@@ -3,7 +3,8 @@ import { SLPKArchive } from './slpk-archieve';
 /**
  * Creates slpk file handler from raw file
  * @param fileProvider raw file data
+ * @param cb is called with information message during parsing
  * @returns slpk file handler
  */
-export declare const parseSLPK: (fileProvider: FileProvider) => Promise<SLPKArchive>;
+export declare const parseSLPK: (fileProvider: FileProvider, cb?: ((msg: string) => void) | undefined) => Promise<SLPKArchive>;
 //# sourceMappingURL=parse-slpk.d.ts.map

package/dist/lib/parsers/parse-slpk/parse-slpk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAGxD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C;;;;GAIG;AAEH,eAAO,MAAM,SAAS,iBAAwB,YAAY,KAAG,QAAQ,WAAW,CA8B/E,CAAC"}
+{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAGxD,OAAO,EAAc,WAAW,EAAgB,MAAM,iBAAiB,CAAC;AAExE;;;;;GAKG;AACH,eAAO,MAAM,SAAS,iBACN,YAAY,cACf,MAAM,KAAK,IAAI,kBACzB,QAAQ,WAAW,CA8BrB,CAAC"}

package/dist/lib/parsers/parse-slpk/parse-slpk.js

@@ -1,31 +1,77 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSLPK = void 0;
+const md5_1 = __importDefault(require("md5"));
 const cd_file_header_1 = require("../parse-zip/cd-file-header");
+const end_of_central_directory_1 = require("../parse-zip/end-of-central-directory");
 const local_file_header_1 = require("../parse-zip/local-file-header");
-const search_from_the_end_1 = require("./search-from-the-end");
+const search_from_the_end_1 = require("../parse-zip/search-from-the-end");
 const slpk_archieve_1 = require("./slpk-archieve");
 /**
  * Creates slpk file handler from raw file
  * @param fileProvider raw file data
+ * @param cb is called with information message during parsing
  * @returns slpk file handler
  */
-const parseSLPK = async (fileProvider) => {
-    const cdFileHeaderSignature = [0x50, 0x4b, 0x01, 0x02];
-    const hashCDOffset = await (0, search_from_the_end_1.searchFromTheEnd)(fileProvider, cdFileHeaderSignature);
+const parseSLPK = async (fileProvider, cb) => {
+    const hashCDOffset = await (0, search_from_the_end_1.searchFromTheEnd)(fileProvider, cd_file_header_1.signature);
     const cdFileHeader = await (0, cd_file_header_1.parseZipCDFileHeader)(hashCDOffset, fileProvider);
-    if (cdFileHeader.fileName !== '@specialIndexFileHASH128@') {
-        throw new Error('No hash file in slpk');
-    }
-    const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(cdFileHeader.localHeaderOffset, fileProvider);
-    if (!localFileHeader) {
-        throw new Error('No hash file in slpk');
+    let hashData;
+    if (cdFileHeader?.fileName !== '@specialIndexFileHASH128@') {
+        cb?.('SLPK doesnt contain hash file');
+        hashData = await generateHashInfo(fileProvider);
+        cb?.('hash info has been composed according to central directory records');
     }
-    const fileDataOffset = localFileHeader.fileDataOffset;
-    const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
-    if (!hashFile) {
-        throw new Error('No hash file in slpk');
+    else {
+        cb?.('SLPK contains hash file');
+        const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(cdFileHeader.localHeaderOffset, fileProvider);
+        if (!localFileHeader) {
+            throw new Error('corrupted SLPK');
+        }
+        const fileDataOffset = localFileHeader.fileDataOffset;
+        const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
+        hashData = parseHashFile(hashFile);
     }
-    return new slpk_archieve_1.SLPKArchive(fileProvider, hashFile);
+    return new slpk_archieve_1.SLPKArchive(fileProvider, hashData);
 };
 exports.parseSLPK = parseSLPK;
+/**
+ * generates hash info from central directory
+ * @param fileProvider - provider of the archive
+ * @returns ready to use hash info
+ */
+const generateHashInfo = async (fileProvider) => {
+    const { cdStartOffset } = await (0, end_of_central_directory_1.parseEoCDRecord)(fileProvider);
+    let cdHeader = await (0, cd_file_header_1.parseZipCDFileHeader)(cdStartOffset, fileProvider);
+    const hashInfo = [];
+    while (cdHeader) {
+        hashInfo.push({
+            hash: Buffer.from((0, md5_1.default)(cdHeader.fileName.split('\\').join('/').toLocaleLowerCase()), 'hex'),
+            offset: cdHeader.localHeaderOffset
+        });
+        cdHeader = await (0, cd_file_header_1.parseZipCDFileHeader)(cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength), fileProvider);
+    }
+    hashInfo.sort((a, b) => (0, slpk_archieve_1.compareHashes)(a.hash, b.hash));
+    return hashInfo;
+};
+/**
+ * Reads hash file from buffer and returns it in ready-to-use form
+ * @param hashFile - bufer containing hash file
+ * @returns Array containing file info
+ */
+const parseHashFile = (hashFile) => {
+    const hashFileBuffer = Buffer.from(hashFile);
+    const hashArray = [];
+    for (let i = 0; i < hashFileBuffer.buffer.byteLength; i = i + 24) {
+        const offsetBuffer = new DataView(hashFileBuffer.buffer.slice(hashFileBuffer.byteOffset + i + 16, hashFileBuffer.byteOffset + i + 24));
+        const offset = offsetBuffer.getBigUint64(offsetBuffer.byteOffset, true);
+        hashArray.push({
+            hash: Buffer.from(hashFileBuffer.subarray(hashFileBuffer.byteOffset + i, hashFileBuffer.byteOffset + i + 16)),
+            offset
+        });
+    }
+    return hashArray;
+};

package/dist/lib/parsers/parse-slpk/slpk-archieve.d.ts

@@ -1,21 +1,32 @@
 /// <reference types="node" />
 import { FileProvider } from '../parse-zip/file-provider';
+/** Element of hash array */
+export type HashElement = {
+    /** File name hash */
+    hash: Buffer;
+    /** File offset in the archive */
+    offset: bigint;
+};
+/**
+ * Comparing md5 hashes according to https://github.com/Esri/i3s-spec/blob/master/docs/2.0/slpk_hashtable.pcsl.md step 5
+ * @param hash1 hash to compare
+ * @param hash2 hash to compare
+ * @returns -1 if hash1 < hash2, 0 of hash1 === hash2, 1 if hash1 > hash2
+ */
+export declare const compareHashes: (hash1: Buffer, hash2: Buffer) => number;
 /**
  * Class for handling information about slpk file
  */
 export declare class SLPKArchive {
-    slpkArchive: FileProvider;
-    hashArray: {
-        hash: Buffer;
-        offset: bigint;
-    }[];
-    constructor(slpkArchive: FileProvider, hashFile: ArrayBuffer);
+    private slpkArchive;
+    private hashArray;
+    constructor(slpkArchive: FileProvider, hashFile: HashElement[]);
     /**
-     * Reads hash file from buffer and returns it in ready-to-use form
-     * @param hashFile - bufer containing hash file
-     * @returns Array containing file info
+     * Binary search in the hash info
+     * @param hashToSearch hash that we need to find
+     * @returns required hash element or undefined if not found
      */
-    private parseHashFile;
+    private findBin;
     /**
      * Returns file with the given path from slpk archive
      * @param path - path inside the slpk

package/dist/lib/parsers/parse-slpk/slpk-archieve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slpk-archieve.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/slpk-archieve.ts"],"names":[],"mappings":";AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAkDxD;;GAEG;AACH,qBAAa,WAAW;IACtB,WAAW,EAAE,YAAY,CAAC;IAC1B,SAAS,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;gBAChC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW;IAK5D;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAqBrB;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,KAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IA8B1E;;;;OAIG;YACW,aAAa;IAc3B;;;;OAIG;YACW,YAAY;CAmB3B"}
+{"version":3,"file":"slpk-archieve.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/slpk-archieve.ts"],"names":[],"mappings":";AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,4BAA4B;AAC5B,MAAM,MAAM,WAAW,GAAG;IACxB,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,UAAW,MAAM,SAAS,MAAM,KAAG,MAY5D,CAAC;AAsCF;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,SAAS,CAAgB;gBACrB,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE;IAK9D;;;;OAIG;IACH,OAAO,CAAC,OAAO,CAgBb;IAEF;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,KAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IA8B1E;;;;OAIG;YACW,aAAa;IAmB3B;;;;OAIG;YACW,YAAY;CAmB3B"}

package/dist/lib/parsers/parse-slpk/slpk-archieve.js

@@ -3,10 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SLPKArchive = void 0;
+exports.SLPKArchive = exports.compareHashes = void 0;
 const md5_1 = __importDefault(require("md5"));
 const local_file_header_1 = require("../parse-zip/local-file-header");
 const compression_1 = require("@loaders.gl/compression");
+/**
+ * Comparing md5 hashes according to https://github.com/Esri/i3s-spec/blob/master/docs/2.0/slpk_hashtable.pcsl.md step 5
+ * @param hash1 hash to compare
+ * @param hash2 hash to compare
+ * @returns -1 if hash1 < hash2, 0 of hash1 === hash2, 1 if hash1 > hash2
+ */
+const compareHashes = (hash1, hash2) => {
+    const h1 = new BigUint64Array(hash1.buffer, hash1.byteOffset, 2);
+    const h2 = new BigUint64Array(hash2.buffer, hash2.byteOffset, 2);
+    const diff = h1[0] === h2[0] ? h1[1] - h2[1] : h1[0] - h2[0];
+    if (diff < 0n) {
+        return -1;
+    }
+    else if (diff === 0n) {
+        return 0;
+    }
+    return 1;
+};
+exports.compareHashes = compareHashes;
 /** Description of real paths for different file types */
 const PATH_DESCRIPTIONS = [
     {
@@ -18,7 +37,7 @@ const PATH_DESCRIPTIONS = [
         extensions: ['.json.gz']
     },
     {
-        test: /^nodes\/\d+$/,
+        test: /^nodes\/(\d+|root)$/,
         extensions: ['/3dNodeIndexDocument.json.gz']
     },
     {
@@ -47,26 +66,31 @@ const PATH_DESCRIPTIONS = [
  */
 class SLPKArchive {
     constructor(slpkArchive, hashFile) {
+        /**
+         * Binary search in the hash info
+         * @param hashToSearch hash that we need to find
+         * @returns required hash element or undefined if not found
+         */
+        this.findBin = (hashToSearch) => {
+            let lowerBorder = 0;
+            let upperBorder = this.hashArray.length;
+            while (upperBorder - lowerBorder > 1) {
+                const middle = lowerBorder + Math.floor((upperBorder - lowerBorder) / 2);
+                const value = (0, exports.compareHashes)(this.hashArray[middle].hash, hashToSearch);
+                if (value === 0) {
+                    return this.hashArray[middle];
+                }
+                else if (value < 0) {
+                    lowerBorder = middle;
+                }
+                else {
+                    upperBorder = middle;
+                }
+            }
+            return undefined;
+        };
         this.slpkArchive = slpkArchive;
-        this.hashArray = this.parseHashFile(hashFile);
-    }
-    /**
-     * Reads hash file from buffer and returns it in ready-to-use form
-     * @param hashFile - bufer containing hash file
-     * @returns Array containing file info
-     */
-    parseHashFile(hashFile) {
-        const hashFileBuffer = Buffer.from(hashFile);
-        const hashArray = [];
-        for (let i = 0; i < hashFileBuffer.buffer.byteLength; i = i + 24) {
-            const offsetBuffer = new DataView(hashFileBuffer.buffer.slice(hashFileBuffer.byteOffset + i + 16, hashFileBuffer.byteOffset + i + 24));
-            const offset = offsetBuffer.getBigUint64(offsetBuffer.byteOffset, true);
-            hashArray.push({
-                hash: Buffer.from(hashFileBuffer.subarray(hashFileBuffer.byteOffset + i, hashFileBuffer.byteOffset + i + 16)),
-                offset
-            });
-        }
-        return hashArray;
+        this.hashArray = hashFile;
     }
     /**
      * Returns file with the given path from slpk archive
@@ -108,7 +132,12 @@ class SLPKArchive {
      * @returns buffer with the file data
      */
     async getDataByPath(path) {
-        const data = await this.getFileBytes(path);
+        // sometimes paths are not in lower case when hash file is created,
+        // so first we're looking for lower case file name and then for original one
+        let data = await this.getFileBytes(path.toLocaleLowerCase());
+        if (!data) {
+            data = await this.getFileBytes(path);
+        }
         if (!data) {
             return undefined;
         }
@@ -126,11 +155,11 @@ class SLPKArchive {
      */
     async getFileBytes(path) {
         const nameHash = Buffer.from((0, md5_1.default)(path), 'hex');
-        const fileInfo = this.hashArray.find((val) => Buffer.compare(val.hash, nameHash) === 0);
+        const fileInfo = this.findBin(nameHash); // implement binary search
         if (!fileInfo) {
             return undefined;
         }
-        const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(fileInfo?.offset, this.slpkArchive);
+        const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(fileInfo.offset, this.slpkArchive);
         if (!localFileHeader) {
             return undefined;
         }

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

@@ -1,4 +1,5 @@
 import { FileProvider } from './file-provider';
+import { ZipSignature } from './search-from-the-end';
 /**
  * zip central directory file header info
  * according to https://en.wikipedia.org/wiki/ZIP_(file_format)
@@ -8,6 +9,8 @@ export type ZipCDFileHeader = {
     compressedSize: bigint;
     /** Uncompressed size */
     uncompressedSize: bigint;
+    /** Extra field size */
+    extraFieldLength: number;
     /** File name length */
     fileNameLength: number;
     /** File name */
@@ -17,11 +20,12 @@ export type ZipCDFileHeader = {
     /** Relative offset of local file header */
     localHeaderOffset: bigint;
 };
+export declare const signature: ZipSignature;
 /**
  * Parses central directory file header of zip file
  * @param headerOffset - offset in the archive where header starts
  * @param buffer - buffer containing whole array
  * @returns Info from the header
  */
-export declare const parseZipCDFileHeader: (headerOffset: bigint, buffer: FileProvider) => Promise<ZipCDFileHeader>;
+export declare const parseZipCDFileHeader: (headerOffset: bigint, buffer: FileProvider) => Promise<ZipCDFileHeader | null>;
 //# sourceMappingURL=cd-file-header.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cd-file-header.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/cd-file-header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,sBAAsB;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,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;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,iBACjB,MAAM,UACZ,YAAY,KACnB,QAAQ,eAAe,CAyDzB,CAAC"}
+{"version":3,"file":"cd-file-header.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/cd-file-header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,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;AAWF,eAAO,MAAM,SAAS,EAAE,YAAuC,CAAC;AAEhE;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,iBACjB,MAAM,UACZ,YAAY,KACnB,QAAQ,eAAe,GAAG,IAAI,CA6DhC,CAAC"}

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

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseZipCDFileHeader = void 0;
+exports.parseZipCDFileHeader = exports.signature = void 0;
+const offsets = {
+    CD_COMPRESSED_SIZE_OFFSET: 20n,
+    CD_UNCOMPRESSED_SIZE_OFFSET: 24n,
+    CD_FILE_NAME_LENGTH_OFFSET: 28n,
+    CD_EXTRA_FIELD_LENGTH_OFFSET: 30n,
+    CD_LOCAL_HEADER_OFFSET_OFFSET: 42n,
+    CD_FILE_NAME_OFFSET: 46n
+};
+exports.signature = [0x50, 0x4b, 0x01, 0x02];
 /**
  * Parses central directory file header of zip file
  * @param headerOffset - offset in the archive where header starts
@@ -8,16 +17,12 @@ exports.parseZipCDFileHeader = void 0;
  * @returns Info from the header
  */
 const parseZipCDFileHeader = async (headerOffset, buffer) => {
-    const offsets = {
-        CD_COMPRESSED_SIZE_OFFSET: 20n,
-        CD_UNCOMPRESSED_SIZE_OFFSET: 24n,
-        CD_FILE_NAME_LENGTH_OFFSET: 28n,
-        CD_EXTRA_FIELD_LENGTH_OFFSET: 30n,
-        CD_LOCAL_HEADER_OFFSET_OFFSET: 42n,
-        CD_FILE_NAME_OFFSET: 46n
-    };
+    if (Buffer.from(await buffer.slice(headerOffset, headerOffset + 4n)).compare(Buffer.from(exports.signature)) !== 0) {
+        return null;
+    }
     let compressedSize = BigInt(await buffer.getUint32(headerOffset + offsets.CD_COMPRESSED_SIZE_OFFSET));
     let uncompressedSize = BigInt(await buffer.getUint32(headerOffset + offsets.CD_UNCOMPRESSED_SIZE_OFFSET));
+    const extraFieldLength = await buffer.getUint16(headerOffset + offsets.CD_EXTRA_FIELD_LENGTH_OFFSET);
     const fileNameLength = await buffer.getUint16(headerOffset + offsets.CD_FILE_NAME_LENGTH_OFFSET);
     const fileName = new TextDecoder().decode(await buffer.slice(headerOffset + offsets.CD_FILE_NAME_OFFSET, headerOffset + offsets.CD_FILE_NAME_OFFSET + BigInt(fileNameLength)));
     const extraOffset = headerOffset + offsets.CD_FILE_NAME_OFFSET + BigInt(fileNameLength);
@@ -40,6 +45,7 @@ const parseZipCDFileHeader = async (headerOffset, buffer) => {
     return {
         compressedSize,
         uncompressedSize,
+        extraFieldLength,
         fileNameLength,
         fileName,
         extraOffset,

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

@@ -0,0 +1,18 @@
+import { FileProvider } from './file-provider';
+/**
+ * End of central directory info
+ * according to https://en.wikipedia.org/wiki/ZIP_(file_format)
+ */
+export type ZipEoCDRecord = {
+    /** Relative offset of local file header */
+    cdStartOffset: bigint;
+    /** Relative offset of local file header */
+    cdRecordsNumber: bigint;
+};
+/**
+ * Parses end of central directory record of zip file
+ * @param fileProvider - FileProvider instance
+ * @returns Info from the header
+ */
+export declare const parseEoCDRecord: (fileProvider: FileProvider) => Promise<ZipEoCDRecord>;
+//# sourceMappingURL=end-of-central-directory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"end-of-central-directory.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/end-of-central-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAgBF;;;;GAIG;AACH,eAAO,MAAM,eAAe,iBAAwB,YAAY,KAAG,QAAQ,aAAa,CA4CvF,CAAC"}