@loaders.gl/i3s 4.0.0-alpha.19 → 4.0.0-alpha.21

package/dist/i3s-content-worker.js

@@ -61,7 +61,7 @@
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.19" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.21" : 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.");
   }
@@ -1045,7 +1045,7 @@
   var isFunction = (x) => typeof x === "function";
   var isObject = (x) => x !== null && typeof x === "object";
   var isPureObject = (x) => isObject(x) && x.constructor === {}.constructor;
-  var isIterable = (x) => x && typeof x[Symbol.iterator] === "function";
+  var isIterable = (x) => Boolean(x) && typeof x[Symbol.iterator] === "function";
   var isAsyncIterable = (x) => x && typeof x[Symbol.asyncIterator] === "function";
   var isResponse = (x) => typeof Response !== "undefined" && x instanceof Response || x && x.arrayBuffer && x.text && x.json;
   var isBlob = (x) => typeof Blob !== "undefined" && x instanceof Blob;
@@ -1262,7 +1262,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.19" : "untranspiled source";
+  var VERSION3 = true ? "4.0.0-alpha.21" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -2307,12 +2307,12 @@
   // ../core/src/lib/loader-utils/get-fetch-function.ts
   function getFetchFunction(options, context) {
     const globalOptions = getGlobalLoaderOptions();
-    const fetchOptions = options || globalOptions;
-    if (typeof fetchOptions.fetch === "function") {
-      return fetchOptions.fetch;
+    const loaderOptions = options || globalOptions;
+    if (typeof loaderOptions.fetch === "function") {
+      return loaderOptions.fetch;
     }
-    if (isObject(fetchOptions.fetch)) {
-      return (url) => fetchFile(url, fetchOptions);
+    if (isObject(loaderOptions.fetch)) {
+      return (url) => fetchFile(url, loaderOptions.fetch);
     }
     if (context?.fetch) {
       return context?.fetch;
@@ -2386,20 +2386,20 @@
       context.response = { headers, ok, redirected, status, statusText, type, url };
     }
     data = await getArrayBufferOrStringFromData(data, loader, options);
-    if (loader.parseTextSync && typeof data === "string") {
-      options.dataType = "text";
-      return loader.parseTextSync(data, options, context, loader);
+    const loaderWithParser = loader;
+    if (loaderWithParser.parseTextSync && typeof data === "string") {
+      return loaderWithParser.parseTextSync(data, options, context);
     }
     if (canParseWithWorker(loader, options)) {
       return await parseWithWorker(loader, data, options, context, parse);
     }
-    if (loader.parseText && typeof data === "string") {
-      return await loader.parseText(data, options, context, loader);
+    if (loaderWithParser.parseText && typeof data === "string") {
+      return await loaderWithParser.parseText(data, options, context);
     }
-    if (loader.parse) {
-      return await loader.parse(data, options, context, loader);
+    if (loaderWithParser.parse) {
+      return await loaderWithParser.parse(data, options, context);
     }
-    assert2(!loader.parseSync);
+    assert2(!loaderWithParser.parseSync);
     throw new Error(`${loader.id} loader - no parser found and worker is disabled`);
   }
 
@@ -4611,7 +4611,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.19" : "latest";
+  var VERSION4 = true ? "4.0.0-alpha.21" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -5008,7 +5008,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0-alpha.19" : "latest";
+  var VERSION5 = true ? "4.0.0-alpha.21" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5561,7 +5561,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.0.0-alpha.19" : "beta";
+  var VERSION6 = true ? "4.0.0-alpha.21" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7253,7 +7253,7 @@
   }
 
   // src/i3s-attribute-loader.ts
-  var VERSION7 = true ? "4.0.0-alpha.19" : "latest";
+  var VERSION7 = true ? "4.0.0-alpha.21" : "latest";
   var I3SAttributeLoader = {
     name: "I3S Attribute",
     id: "i3s-attribute",
@@ -7716,7 +7716,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION8 = true ? "4.0.0-alpha.19" : "beta";
+  var VERSION8 = true ? "4.0.0-alpha.21" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/i3s-slpk-loader.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SLPKLoader = void 0;
+const zip_1 = require("@loaders.gl/zip");
 const parse_slpk_1 = require("./lib/parsers/parse-slpk/parse-slpk");
-const data_view_file_provider_1 = require("./lib/parsers/parse-zip/data-view-file-provider");
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
@@ -26,5 +26,5 @@ exports.SLPKLoader = {
  * @returns requested file
  */
 async function parseSLPK(data, options = {}) {
-    return (await (0, parse_slpk_1.parseSLPK)(new data_view_file_provider_1.DataViewFileProvider(new DataView(data)))).getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
+    return (await (0, parse_slpk_1.parseSLPK)(new zip_1.DataViewFile(new DataView(data)))).getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
 }

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export type { BoundingVolumes, Mbs, Obb, I3STilesetHeader, I3STileContent, I3STileHeader, 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 type { I3SLoaderOptions } from './i3s-loader';
 export { COORDINATE_SYSTEM } from './lib/parsers/constants';
 export { I3SLoader } from './i3s-loader';
@@ -9,6 +8,5 @@ export { I3SAttributeLoader, loadFeatureAttributes } from './i3s-attribute-loade
 export { I3SBuildingSceneLayerLoader } from './i3s-building-scene-layer-loader';
 export { I3SNodePageLoader } from './i3s-node-page-loader';
 export { ArcGisWebSceneLoader } from './arcgis-webscene-loader';
-export { parseZipLocalFileHeader } from './lib/parsers/parse-zip/local-file-header';
 export { parseSLPK } from './lib/parsers/parse-slpk/parse-slpk';
 //# 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":"AAEA,YAAY,EACV,eAAe,EACf,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,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;AACxE,YAAY,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAEnD,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,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,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,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAEnD,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,SAAS,EAAC,MAAM,qCAAqC,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSLPK = exports.parseZipLocalFileHeader = exports.ArcGisWebSceneLoader = exports.I3SNodePageLoader = exports.I3SBuildingSceneLayerLoader = exports.loadFeatureAttributes = exports.I3SAttributeLoader = exports.I3SContentLoader = exports.SLPKLoader = exports.I3SLoader = exports.COORDINATE_SYSTEM = void 0;
+exports.parseSLPK = exports.ArcGisWebSceneLoader = exports.I3SNodePageLoader = exports.I3SBuildingSceneLayerLoader = exports.loadFeatureAttributes = exports.I3SAttributeLoader = exports.I3SContentLoader = exports.SLPKLoader = exports.I3SLoader = exports.COORDINATE_SYSTEM = void 0;
 var constants_1 = require("./lib/parsers/constants");
 Object.defineProperty(exports, "COORDINATE_SYSTEM", { enumerable: true, get: function () { return constants_1.COORDINATE_SYSTEM; } });
 var i3s_loader_1 = require("./i3s-loader");
@@ -19,7 +19,5 @@ var i3s_node_page_loader_1 = require("./i3s-node-page-loader");
 Object.defineProperty(exports, "I3SNodePageLoader", { enumerable: true, get: function () { return i3s_node_page_loader_1.I3SNodePageLoader; } });
 var arcgis_webscene_loader_1 = require("./arcgis-webscene-loader");
 Object.defineProperty(exports, "ArcGisWebSceneLoader", { enumerable: true, get: function () { return arcgis_webscene_loader_1.ArcGisWebSceneLoader; } });
-var local_file_header_1 = require("./lib/parsers/parse-zip/local-file-header");
-Object.defineProperty(exports, "parseZipLocalFileHeader", { enumerable: true, get: function () { return local_file_header_1.parseZipLocalFileHeader; } });
 var parse_slpk_1 = require("./lib/parsers/parse-slpk/parse-slpk");
 Object.defineProperty(exports, "parseSLPK", { enumerable: true, get: function () { return parse_slpk_1.parseSLPK; } });

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

@@ -1,4 +1,4 @@
-import { FileProvider } from '../parse-zip/file-provider';
+import { FileProvider } from '@loaders.gl/zip';
 import { SLPKArchive } from './slpk-archieve';
 /**
  * Creates slpk file handler from raw file

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":"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"}
+{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAMb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C;;;;;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,14 +1,7 @@
 "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("../parse-zip/search-from-the-end");
+const zip_1 = require("@loaders.gl/zip");
 const slpk_archieve_1 = require("./slpk-archieve");
 /**
  * Creates slpk file handler from raw file
@@ -17,61 +10,24 @@ const slpk_archieve_1 = require("./slpk-archieve");
  * @returns slpk file handler
  */
 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);
+    const hashCDOffset = await (0, zip_1.searchFromTheEnd)(fileProvider, zip_1.cdSignature);
+    const cdFileHeader = await (0, zip_1.parseZipCDFileHeader)(hashCDOffset, fileProvider);
     let hashData;
     if (cdFileHeader?.fileName !== '@specialIndexFileHASH128@') {
         cb?.('SLPK doesnt contain hash file');
-        hashData = await generateHashInfo(fileProvider);
+        hashData = await (0, zip_1.generateHashInfo)(fileProvider);
         cb?.('hash info has been composed according to central directory records');
     }
     else {
         cb?.('SLPK contains hash file');
-        const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(cdFileHeader.localHeaderOffset, fileProvider);
+        const localFileHeader = await (0, zip_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);
+        hashData = (0, zip_1.parseHashFile)(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,19 +1,5 @@
 /// <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;
+import { FileProvider, HashElement } from '@loaders.gl/zip';
 /**
  * Class for handling information about slpk file
  */
@@ -21,12 +7,6 @@ export declare class SLPKArchive {
     private slpkArchive;
     private hashArray;
     constructor(slpkArchive: FileProvider, hashFile: HashElement[]);
-    /**
-     * Binary search in the hash info
-     * @param hashToSearch hash that we need to find
-     * @returns required hash element or undefined if not found
-     */
-    private findBin;
     /**
      * Returns file with the given path from slpk archive
      * @param path - path inside the slpk
@@ -46,5 +26,6 @@ export declare class SLPKArchive {
      * @returns buffer with the raw file data
      */
     private getFileBytes;
+    findBin(nameHash: Buffer): void;
 }
 //# sourceMappingURL=slpk-archieve.d.ts.map

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;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"}
+{"version":3,"file":"slpk-archieve.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/slpk-archieve.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,YAAY,EAA2B,WAAW,EAAU,MAAM,iBAAiB,CAAC;AAuC5F;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,SAAS,CAAgB;gBACrB,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE;IAK9D;;;;;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;IAmB1B,OAAO,CAAC,QAAQ,EAAE,MAAM;CAGzB"}

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

@@ -3,29 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SLPKArchive = exports.compareHashes = void 0;
+exports.SLPKArchive = void 0;
 const md5_1 = __importDefault(require("md5"));
-const local_file_header_1 = require("../parse-zip/local-file-header");
+const zip_1 = require("@loaders.gl/zip");
 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 = [
     {
@@ -66,29 +47,6 @@ 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 = hashFile;
     }
@@ -155,16 +113,19 @@ class SLPKArchive {
      */
     async getFileBytes(path) {
         const nameHash = Buffer.from((0, md5_1.default)(path), 'hex');
-        const fileInfo = this.findBin(nameHash); // implement binary search
+        const fileInfo = (0, zip_1.findBin)(nameHash, this.hashArray); // implement binary search
         if (!fileInfo) {
             return undefined;
         }
-        const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(fileInfo.offset, this.slpkArchive);
+        const localFileHeader = await (0, zip_1.parseZipLocalFileHeader)(fileInfo.offset, this.slpkArchive);
         if (!localFileHeader) {
             return undefined;
         }
         const compressedFile = this.slpkArchive.slice(localFileHeader.fileDataOffset, localFileHeader.fileDataOffset + localFileHeader.compressedSize);
         return compressedFile;
     }
+    findBin(nameHash) {
+        throw new Error('Method not implemented.');
+    }
 }
 exports.SLPKArchive = SLPKArchive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.0-alpha.19",
+  "version": "4.0.0-alpha.21",
   "description": "i3s .",
   "license": "MIT",
   "publishConfig": {
@@ -33,13 +33,13 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.0.0-alpha.19",
-    "@loaders.gl/draco": "4.0.0-alpha.19",
-    "@loaders.gl/images": "4.0.0-alpha.19",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.19",
-    "@loaders.gl/schema": "4.0.0-alpha.19",
-    "@loaders.gl/textures": "4.0.0-alpha.19",
-    "@loaders.gl/tiles": "4.0.0-alpha.19",
+    "@loaders.gl/compression": "4.0.0-alpha.21",
+    "@loaders.gl/draco": "4.0.0-alpha.21",
+    "@loaders.gl/images": "4.0.0-alpha.21",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.21",
+    "@loaders.gl/schema": "4.0.0-alpha.21",
+    "@loaders.gl/textures": "4.0.0-alpha.21",
+    "@loaders.gl/tiles": "4.0.0-alpha.21",
     "@luma.gl/constants": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -49,5 +49,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0-alpha.8"
   },
-  "gitHead": "2ca50ec4e1d312c124eb7c93c60ab6fd17ee833e"
+  "gitHead": "df5d670b136192b26941396e944f9c46be788e83"
 }

package/src/i3s-slpk-loader.ts

@@ -1,6 +1,6 @@
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
+import {DataViewFile} from '@loaders.gl/zip';
 import {parseSLPK as parseSLPKFromProvider} from './lib/parsers/parse-slpk/parse-slpk';
-import {DataViewFileProvider} from './lib/parsers/parse-zip/data-view-file-provider';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -38,7 +38,7 @@ export const SLPKLoader: LoaderWithParser<Buffer, never, SLPKLoaderOptions> = {
  */
 
 async function parseSLPK(data: ArrayBuffer, options: SLPKLoaderOptions = {}) {
-  return (await parseSLPKFromProvider(new DataViewFileProvider(new DataView(data)))).getFile(
+  return (await parseSLPKFromProvider(new DataViewFile(new DataView(data)))).getFile(
     options.slpk?.path ?? '',
     options.slpk?.pathMode
   );

package/src/index.ts

@@ -35,7 +35,6 @@ export type {
   OperationalLayer,
   TextureSetDefinitionFormats
 } from './types';
-export type {FileProvider} from './lib/parsers/parse-zip/file-provider';
 export type {I3SLoaderOptions} from './i3s-loader';
 
 export {COORDINATE_SYSTEM} from './lib/parsers/constants';
@@ -47,5 +46,4 @@ export {I3SAttributeLoader, loadFeatureAttributes} from './i3s-attribute-loader'
 export {I3SBuildingSceneLayerLoader} from './i3s-building-scene-layer-loader';
 export {I3SNodePageLoader} from './i3s-node-page-loader';
 export {ArcGisWebSceneLoader} from './arcgis-webscene-loader';
-export {parseZipLocalFileHeader} from './lib/parsers/parse-zip/local-file-header';
 export {parseSLPK} from './lib/parsers/parse-slpk/parse-slpk';

package/src/lib/parsers/parse-slpk/parse-slpk.ts

@@ -1,10 +1,14 @@
-import md5 from 'md5';
-import {parseZipCDFileHeader, signature as cdHeaderSignature} from '../parse-zip/cd-file-header';
-import {parseEoCDRecord} from '../parse-zip/end-of-central-directory';
-import {FileProvider} from '../parse-zip/file-provider';
-import {parseZipLocalFileHeader} from '../parse-zip/local-file-header';
-import {searchFromTheEnd} from '../parse-zip/search-from-the-end';
-import {HashElement, SLPKArchive, compareHashes} from './slpk-archieve';
+import {
+  parseZipCDFileHeader,
+  cdSignature as cdHeaderSignature,
+  FileProvider,
+  parseZipLocalFileHeader,
+  searchFromTheEnd,
+  HashElement,
+  parseHashFile,
+  generateHashInfo
+} from '@loaders.gl/zip';
+import {SLPKArchive} from './slpk-archieve';
 
 /**
  * Creates slpk file handler from raw file
@@ -46,52 +50,3 @@ export const parseSLPK = async (
 
   return new SLPKArchive(fileProvider, hashData);
 };
-
-/**
- * generates hash info from central directory
- * @param fileProvider - provider of the archive
- * @returns ready to use hash info
- */
-const generateHashInfo = async (fileProvider: FileProvider): Promise<HashElement[]> => {
-  const {cdStartOffset} = await parseEoCDRecord(fileProvider);
-  let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);
-  const hashInfo: HashElement[] = [];
-  while (cdHeader) {
-    hashInfo.push({
-      hash: Buffer.from(md5(cdHeader.fileName.split('\\').join('/').toLocaleLowerCase()), 'hex'),
-      offset: cdHeader.localHeaderOffset
-    });
-    cdHeader = await parseZipCDFileHeader(
-      cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),
-      fileProvider
-    );
-  }
-  hashInfo.sort((a, b) => 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: ArrayBuffer): HashElement[] => {
-  const hashFileBuffer = Buffer.from(hashFile);
-  const hashArray: HashElement[] = [];
-  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/src/lib/parsers/parse-slpk/slpk-archieve.ts

@@ -1,35 +1,6 @@
 import md5 from 'md5';
-import {parseZipLocalFileHeader} from '../parse-zip/local-file-header';
+import {FileProvider, parseZipLocalFileHeader, HashElement, findBin} from '@loaders.gl/zip';
 import {GZipCompression} from '@loaders.gl/compression';
-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 const compareHashes = (hash1: Buffer, hash2: Buffer): number => {
-  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;
-};
 
 /** Description of real paths for different file types */
 const PATH_DESCRIPTIONS: {test: RegExp; extensions: string[]}[] = [
@@ -78,29 +49,6 @@ export class SLPKArchive {
     this.hashArray = hashFile;
   }
 
-  /**
-   * Binary search in the hash info
-   * @param hashToSearch hash that we need to find
-   * @returns required hash element or undefined if not found
-   */
-  private findBin = (hashToSearch: Buffer): HashElement | undefined => {
-    let lowerBorder = 0;
-    let upperBorder = this.hashArray.length;
-
-    while (upperBorder - lowerBorder > 1) {
-      const middle = lowerBorder + Math.floor((upperBorder - lowerBorder) / 2);
-      const value = compareHashes(this.hashArray[middle].hash, hashToSearch);
-      if (value === 0) {
-        return this.hashArray[middle];
-      } else if (value < 0) {
-        lowerBorder = middle;
-      } else {
-        upperBorder = middle;
-      }
-    }
-    return undefined;
-  };
-
   /**
    * Returns file with the given path from slpk archive
    * @param path - path inside the slpk
@@ -168,7 +116,7 @@ export class SLPKArchive {
    */
   private async getFileBytes(path: string): Promise<ArrayBuffer | undefined> {
     const nameHash = Buffer.from(md5(path), 'hex');
-    const fileInfo = this.findBin(nameHash); // implement binary search
+    const fileInfo = findBin(nameHash, this.hashArray); // implement binary search
     if (!fileInfo) {
       return undefined;
     }
@@ -185,4 +133,7 @@ export class SLPKArchive {
 
     return compressedFile;
   }
+  findBin(nameHash: Buffer) {
+    throw new Error('Method not implemented.');
+  }
 }