@loaders.gl/i3s 4.0.0-alpha.10 → 4.0.0-alpha.11

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.10" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.11" : 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.");
   }
@@ -1234,7 +1234,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.10" : "untranspiled source";
+  var VERSION3 = true ? "4.0.0-alpha.11" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -4582,7 +4582,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.10" : "latest";
+  var VERSION4 = true ? "4.0.0-alpha.11" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -4979,7 +4979,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0-alpha.10" : "latest";
+  var VERSION5 = true ? "4.0.0-alpha.11" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5524,10 +5524,10 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.0.0-alpha.10" : "beta";
+  var VERSION6 = true ? "4.0.0-alpha.11" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
-  var VERSION7 = true ? "4.0.0-alpha.10" : "beta";
+  var VERSION7 = true ? "4.0.0-alpha.11" : "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;
@@ -7225,7 +7225,7 @@
   }
 
   // src/i3s-attribute-loader.ts
-  var VERSION8 = true ? "4.0.0-alpha.10" : "latest";
+  var VERSION8 = true ? "4.0.0-alpha.11" : "latest";
   var I3SAttributeLoader = {
     name: "I3S Attribute",
     id: "i3s-attribute",
@@ -7688,7 +7688,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION9 = true ? "4.0.0-alpha.10" : "beta";
+  var VERSION9 = true ? "4.0.0-alpha.11" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/index.d.ts

@@ -7,4 +7,6 @@ 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 { FileProvider } from './lib/parsers/parse-zip/file-provider';
 //# 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,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;AAEjB,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"}
+{"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;AAEjB,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,YAAY,EAAC,MAAM,uCAAuC,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcGisWebSceneLoader = exports.I3SNodePageLoader = exports.I3SBuildingSceneLayerLoader = exports.loadFeatureAttributes = exports.I3SAttributeLoader = exports.I3SContentLoader = exports.SLPKLoader = exports.I3SLoader = exports.COORDINATE_SYSTEM = void 0;
+exports.parseZipLocalFileHeader = 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,3 +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; } });

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":";AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAehE,wBAAsB,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,iBAAsB,mBAgDjF"}
+{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAgBhE,wBAAsB,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,iBAAsB,mBAuDjF"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSLPK = void 0;
+const buffer_file_provider_1 = require("../parse-zip/buffer-file-provider");
 const cd_file_header_1 = require("../parse-zip/cd-file-header");
 const local_file_header_1 = require("../parse-zip/local-file-header");
 const slpk_archieve_1 = require("./slpk-archieve");
@@ -34,12 +35,15 @@ async function parseSLPK(data, options = {}) {
             break;
         }
     }
-    const cdFileHeader = (0, cd_file_header_1.parseZipCDFileHeader)(hashCDOffset, archive);
-    const textDecoder = new TextDecoder();
-    if (textDecoder.decode(cdFileHeader.fileName) !== '@specialIndexFileHASH128@') {
+    const fileProvider = new buffer_file_provider_1.DataViewFileProvider(archive);
+    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');
     }
-    const localFileHeader = (0, local_file_header_1.parseZipLocalFileHeader)(cdFileHeader.localHeaderOffset, archive);
     const fileDataOffset = localFileHeader.fileDataOffset;
     const hashFile = archive.buffer.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
     if (!hashFile) {

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":";AAoDA;;GAEG;AACH,qBAAa,WAAW;IACtB,WAAW,EAAE,QAAQ,CAAC;IACtB,SAAS,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;gBAChC,iBAAiB,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW;IAKjE;;;;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;IAiB3B;;;;OAIG;IACH,OAAO,CAAC,YAAY;CAmBrB"}
+{"version":3,"file":"slpk-archieve.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/slpk-archieve.ts"],"names":[],"mappings":";AAqDA;;GAEG;AACH,qBAAa,WAAW;IACtB,WAAW,EAAE,QAAQ,CAAC;IACtB,SAAS,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;gBAChC,iBAAiB,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW;IAKjE;;;;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;CAsB3B"}

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

@@ -4,10 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SLPKArchive = void 0;
-const worker_utils_1 = require("@loaders.gl/worker-utils");
 const md5_1 = __importDefault(require("md5"));
-const compression_1 = require("@loaders.gl/compression");
 const local_file_header_1 = require("../parse-zip/local-file-header");
+const buffer_file_provider_1 = require("../parse-zip/buffer-file-provider");
+const compression_1 = require("@loaders.gl/compression");
+/** Description of real paths for different file types */
 const PATH_DESCRIPTIONS = [
     {
         test: /^$/,
@@ -95,7 +96,7 @@ class SLPKArchive {
             if (decompressedFile) {
                 return Buffer.from(decompressedFile);
             }
-            const fileWithoutCompression = this.getFileBytes(path);
+            const fileWithoutCompression = await this.getFileBytes(path);
             if (fileWithoutCompression) {
                 return Buffer.from(fileWithoutCompression);
             }
@@ -108,17 +109,13 @@ class SLPKArchive {
      * @returns buffer with the file data
      */
     async getDataByPath(path) {
-        const data = this.getFileBytes(path);
+        const data = await this.getFileBytes(path);
         if (!data) {
             return undefined;
         }
         if (/\.gz$/.test(path)) {
-            const decompressedData = await (0, worker_utils_1.processOnWorker)(compression_1.CompressionWorker, data, {
-                compression: 'gzip',
-                operation: 'decompress',
-                _workerType: 'test',
-                gzip: {}
-            });
+            const compression = new compression_1.GZipCompression();
+            const decompressedData = await compression.decompress(data);
             return decompressedData;
         }
         return Buffer.from(data);
@@ -128,13 +125,16 @@ class SLPKArchive {
      * @param path - path inside the archive
      * @returns buffer with the raw file data
      */
-    getFileBytes(path) {
+    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);
         if (!fileInfo) {
             return undefined;
         }
-        const localFileHeader = (0, local_file_header_1.parseZipLocalFileHeader)(this.slpkArchive.byteOffset + fileInfo?.offset, this.slpkArchive);
+        const localFileHeader = await (0, local_file_header_1.parseZipLocalFileHeader)(this.slpkArchive.byteOffset + fileInfo?.offset, new buffer_file_provider_1.DataViewFileProvider(this.slpkArchive));
+        if (!localFileHeader) {
+            return undefined;
+        }
         const compressedFile = this.slpkArchive.buffer.slice(localFileHeader.fileDataOffset, localFileHeader.fileDataOffset + localFileHeader.compressedSize);
         return compressedFile;
     }

package/dist/lib/parsers/parse-zip/buffer-file-provider.d.ts

@@ -0,0 +1,37 @@
+import { FileProvider } from './file-provider';
+/**
+ * Provides file data using DataView
+ */
+export declare class DataViewFileProvider implements FileProvider {
+    /**
+     * The DataView from which data is provided
+     */
+    private file;
+    constructor(file: DataView);
+    /**
+     * Gets an unsigned 8-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint8(offset: number): Promise<number>;
+    /**
+     * Gets an unsigned 16-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint16(offset: number): Promise<number>;
+    /**
+     * Gets an unsigned 32-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint32(offset: number): Promise<number>;
+    /**
+     * returns an ArrayBuffer whose contents are a copy of this file bytes from startOffset, inclusive, up to endOffset, exclusive.
+     * @param startOffset The offset, in bytes, from the start of the file where to start reading the data.
+     * @param endOffset The offset, in bytes, from the start of the file where to end reading the data.
+     */
+    slice(startOffset: number, endOffset: number): Promise<ArrayBuffer>;
+    /**
+     * the length (in bytes) of the data.
+     */
+    get length(): number;
+}
+//# sourceMappingURL=buffer-file-provider.d.ts.map

package/dist/lib/parsers/parse-zip/buffer-file-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buffer-file-provider.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/buffer-file-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C;;GAEG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD;;OAEG;IACH,OAAO,CAAC,IAAI,CAAW;gBAEX,IAAI,EAAE,QAAQ;IAI1B;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzC;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1C;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1C;;;;OAIG;IACH,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAInE;;OAEG;IACH,IAAI,MAAM,WAET;CACF"}

package/dist/lib/parsers/parse-zip/buffer-file-provider.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataViewFileProvider = void 0;
+/**
+ * Provides file data using DataView
+ */
+class DataViewFileProvider {
+    constructor(file) {
+        this.file = file;
+    }
+    /**
+     * Gets an unsigned 8-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint8(offset) {
+        return Promise.resolve(this.file.getUint8(offset));
+    }
+    /**
+     * Gets an unsigned 16-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint16(offset) {
+        return Promise.resolve(this.file.getUint16(offset, true));
+    }
+    /**
+     * Gets an unsigned 32-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint32(offset) {
+        return Promise.resolve(this.file.getUint32(offset, true));
+    }
+    /**
+     * returns an ArrayBuffer whose contents are a copy of this file bytes from startOffset, inclusive, up to endOffset, exclusive.
+     * @param startOffset The offset, in bytes, from the start of the file where to start reading the data.
+     * @param endOffset The offset, in bytes, from the start of the file where to end reading the data.
+     */
+    slice(startOffset, endOffset) {
+        return Promise.resolve(this.file.buffer.slice(startOffset, endOffset));
+    }
+    /**
+     * the length (in bytes) of the data.
+     */
+    get length() {
+        return this.file.byteLength;
+    }
+}
+exports.DataViewFileProvider = DataViewFileProvider;

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

@@ -1,31 +1,20 @@
+import { FileProvider } from './file-provider';
 /**
  * zip central directory file header info
  * according to https://en.wikipedia.org/wiki/ZIP_(file_format)
  */
 export type ZipCDFileHeader = {
-    /**
-     * Compressed size
-     */
+    /** Compressed size */
     compressedSize: number;
-    /**
-     * Uncompressed size
-     */
+    /** Uncompressed size */
     uncompressedSize: number;
-    /**
-     * File name length
-     */
+    /** File name length */
     fileNameLength: number;
-    /**
-     * File name
-     */
-    fileName: ArrayBuffer;
-    /**
-     * Extra field offset
-     */
+    /** File name */
+    fileName: string;
+    /** Extra field offset */
     extraOffset: number;
-    /**
-     * Relative offset of local file header
-     */
+    /** Relative offset of local file header */
     localHeaderOffset: number;
 };
 /**
@@ -34,5 +23,5 @@ export type ZipCDFileHeader = {
  * @param buffer - buffer containing whole array
  * @returns Info from the header
  */
-export declare const parseZipCDFileHeader: (headerOffset: number, buffer: DataView) => ZipCDFileHeader;
+export declare const parseZipCDFileHeader: (headerOffset: number, buffer: FileProvider) => Promise<ZipCDFileHeader>;
 //# 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;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,QAAQ,EAAE,WAAW,CAAC;IACtB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,iBAAkB,MAAM,UAAU,QAAQ,KAAG,eAuD7E,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;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,CAuDzB,CAAC"}

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

@@ -7,7 +7,7 @@ exports.parseZipCDFileHeader = void 0;
  * @param buffer - buffer containing whole array
  * @returns Info from the header
  */
-const parseZipCDFileHeader = (headerOffset, buffer) => {
+const parseZipCDFileHeader = async (headerOffset, buffer) => {
     const offsets = {
         CD_COMPRESSED_SIZE_OFFSET: 20,
         CD_UNCOMPRESSED_SIZE_OFFSET: 24,
@@ -16,12 +16,12 @@ const parseZipCDFileHeader = (headerOffset, buffer) => {
         CD_LOCAL_HEADER_OFFSET_OFFSET: 42,
         CD_FILE_NAME_OFFSET: 46
     };
-    const compressedSize = buffer.getUint32(headerOffset + offsets.CD_COMPRESSED_SIZE_OFFSET, true);
-    const uncompressedSize = buffer.getUint32(headerOffset + offsets.CD_UNCOMPRESSED_SIZE_OFFSET, true);
-    const fileNameLength = buffer.getUint16(headerOffset + offsets.CD_FILE_NAME_LENGTH_OFFSET, true);
-    const fileName = buffer.buffer.slice(headerOffset + offsets.CD_FILE_NAME_OFFSET, headerOffset + offsets.CD_FILE_NAME_OFFSET + fileNameLength);
+    const compressedSize = await buffer.getUint32(headerOffset + offsets.CD_COMPRESSED_SIZE_OFFSET);
+    const uncompressedSize = await buffer.getUint32(headerOffset + offsets.CD_UNCOMPRESSED_SIZE_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 + fileNameLength));
     const extraOffset = headerOffset + offsets.CD_FILE_NAME_OFFSET + fileNameLength;
-    const oldFormatOffset = buffer.getUint32(headerOffset + offsets.CD_LOCAL_HEADER_OFFSET_OFFSET, true);
+    const oldFormatOffset = await buffer.getUint32(headerOffset + offsets.CD_LOCAL_HEADER_OFFSET_OFFSET);
     let fileDataOffset = oldFormatOffset;
     if (fileDataOffset === 0xffffffff) {
         let offsetInZip64Data = 4;
@@ -33,7 +33,7 @@ const parseZipCDFileHeader = (headerOffset, buffer) => {
             offsetInZip64Data += 8;
         }
         // getUint32 needs to be replaced with getBigUint64 for archieves bigger than 2gb
-        fileDataOffset = buffer.getUint32(extraOffset + offsetInZip64Data, true); // setting it to the one from zip64
+        fileDataOffset = await buffer.getUint32(extraOffset + offsetInZip64Data); // setting it to the one from zip64
     }
     const localHeaderOffset = fileDataOffset;
     return {

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

@@ -0,0 +1,31 @@
+/**
+ * Interface for providing file data
+ */
+export interface FileProvider {
+    /**
+     * Gets an unsigned 8-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint8(offset: number): Promise<number>;
+    /**
+     * Gets an unsigned 16-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the start of the file where to read the data.
+     */
+    getUint16(offset: number): Promise<number>;
+    /**
+     * Gets an unsigned 32-bit integer at the specified byte offset from the start of the file.
+     * @param offset The offset, in bytes, from the file of the view where to read the data.
+     */
+    getUint32(offset: number): Promise<number>;
+    /**
+     * returns an ArrayBuffer whose contents are a copy of this file bytes from startOffset, inclusive, up to endOffset, exclusive.
+     * @param startOffset The offset, in bytes, from the start of the file where to start reading the data.
+     * @param endOffset The offset, in bytes, from the start of the file where to end reading the data.
+     */
+    slice(startOffset: number, endOffset: number): Promise<ArrayBuffer>;
+    /**
+     * the length (in bytes) of the data.
+     */
+    length: number;
+}
+//# sourceMappingURL=file-provider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"file-provider.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/file-provider.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1C;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;;;OAIG;IACH,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEpE;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB"}

package/dist/lib/parsers/parse-zip/file-provider.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,23 +1,18 @@
+import { FileProvider } from './file-provider';
 /**
  * zip local file header info
  * according to https://en.wikipedia.org/wiki/ZIP_(file_format)
  */
 export type ZipLocalFileHeader = {
-    /**
-     * File name length
-     */
+    /** File name length */
     fileNameLength: number;
-    /**
-     * Extra field length
-     */
+    /** File name */
+    fileName: string;
+    /** Extra field length */
     extraFieldLength: number;
-    /**
-     * Offset of the file data
-     */
+    /** Offset of the file data */
     fileDataOffset: number;
-    /**
-     * Compressed size
-     */
+    /** Compressed size */
     compressedSize: number;
 };
 /**
@@ -26,5 +21,5 @@ export type ZipLocalFileHeader = {
  * @param buffer - buffer containing whole array
  * @returns Info from the header
  */
-export declare const parseZipLocalFileHeader: (headerOffset: number, buffer: DataView) => ZipLocalFileHeader;
+export declare const parseZipLocalFileHeader: (headerOffset: number, buffer: FileProvider) => Promise<ZipLocalFileHeader | undefined>;
 //# sourceMappingURL=local-file-header.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"local-file-header.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/local-file-header.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,iBACpB,MAAM,UACZ,QAAQ,KACf,kBAuBF,CAAC"}
+{"version":3,"file":"local-file-header.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-zip/local-file-header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,uBAAuB;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,8BAA8B;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB;IACtB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAWF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,iBACpB,MAAM,UACZ,YAAY,KACnB,QAAQ,kBAAkB,GAAG,SAAS,CA2BxC,CAAC"}

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

@@ -1,25 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseZipLocalFileHeader = void 0;
+const offsets = {
+    COMPRESSED_SIZE_OFFSET: 18,
+    FILE_NAME_LENGTH_OFFSET: 26,
+    EXTRA_FIELD_LENGTH_OFFSET: 28,
+    FILE_NAME_OFFSET: 30
+};
+const signature = Buffer.from([0x50, 0x4b, 0x03, 0x04]);
 /**
  * Parses local 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
  */
-const parseZipLocalFileHeader = (headerOffset, buffer) => {
-    const offsets = {
-        COMPRESSED_SIZE_OFFSET: 18,
-        FILE_NAME_LENGTH_OFFSET: 26,
-        EXTRA_FIELD_LENGTH_OFFSET: 28,
-        FILE_NAME_OFFSET: 30
-    };
-    const fileNameLength = buffer.getUint16(headerOffset + offsets.FILE_NAME_LENGTH_OFFSET, true);
-    const extraFieldLength = buffer.getUint16(headerOffset + offsets.EXTRA_FIELD_LENGTH_OFFSET, true);
+const parseZipLocalFileHeader = async (headerOffset, buffer) => {
+    if (Buffer.from(await buffer.slice(headerOffset, headerOffset + 4)).compare(signature) !== 0) {
+        return Promise.resolve(undefined);
+    }
+    const fileNameLength = await buffer.getUint16(headerOffset + offsets.FILE_NAME_LENGTH_OFFSET);
+    const fileName = new TextDecoder().decode(await buffer.slice(headerOffset + offsets.FILE_NAME_OFFSET, headerOffset + offsets.FILE_NAME_OFFSET + fileNameLength));
+    const extraFieldLength = await buffer.getUint16(headerOffset + offsets.EXTRA_FIELD_LENGTH_OFFSET);
     const fileDataOffset = headerOffset + offsets.FILE_NAME_OFFSET + fileNameLength + extraFieldLength;
-    const compressedSize = buffer.getUint32(headerOffset + offsets.COMPRESSED_SIZE_OFFSET, true);
+    const compressedSize = await buffer.getUint32(headerOffset + offsets.COMPRESSED_SIZE_OFFSET);
     return {
         fileNameLength,
+        fileName,
         extraFieldLength,
         fileDataOffset,
         compressedSize

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.0-alpha.10",
+  "version": "4.0.0-alpha.11",
   "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.10",
-    "@loaders.gl/draco": "4.0.0-alpha.10",
-    "@loaders.gl/images": "4.0.0-alpha.10",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.10",
-    "@loaders.gl/schema": "4.0.0-alpha.10",
-    "@loaders.gl/textures": "4.0.0-alpha.10",
-    "@loaders.gl/tiles": "4.0.0-alpha.10",
+    "@loaders.gl/compression": "4.0.0-alpha.11",
+    "@loaders.gl/draco": "4.0.0-alpha.11",
+    "@loaders.gl/images": "4.0.0-alpha.11",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.11",
+    "@loaders.gl/schema": "4.0.0-alpha.11",
+    "@loaders.gl/textures": "4.0.0-alpha.11",
+    "@loaders.gl/tiles": "4.0.0-alpha.11",
     "@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": "7efdbe09e02098aad6d985e4d6465d08806e19a9"
+  "gitHead": "bc680098cfea790c67b7fb95bab96e8d9288d34f"
 }

package/src/index.ts

@@ -43,3 +43,5 @@ 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 {FileProvider} from './lib/parsers/parse-zip/file-provider';

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

@@ -1,4 +1,5 @@
 import type {SLPKLoaderOptions} from '../../../i3s-slpk-loader';
+import {DataViewFileProvider} from '../parse-zip/buffer-file-provider';
 import {parseZipCDFileHeader} from '../parse-zip/cd-file-header';
 import {parseZipLocalFileHeader} from '../parse-zip/local-file-header';
 import {SLPKArchive} from './slpk-archieve';
@@ -38,14 +39,21 @@ export async function parseSLPK(data: ArrayBuffer, options: SLPKLoaderOptions =
     }
   }
 
-  const cdFileHeader = parseZipCDFileHeader(hashCDOffset, archive);
+  const fileProvider = new DataViewFileProvider(archive);
 
-  const textDecoder = new TextDecoder();
-  if (textDecoder.decode(cdFileHeader.fileName) !== '@specialIndexFileHASH128@') {
+  const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
+
+  if (cdFileHeader.fileName !== '@specialIndexFileHASH128@') {
     throw new Error('No hash file in slpk');
   }
 
-  const localFileHeader = parseZipLocalFileHeader(cdFileHeader.localHeaderOffset, archive);
+  const localFileHeader = await parseZipLocalFileHeader(
+    cdFileHeader.localHeaderOffset,
+    fileProvider
+  );
+  if (!localFileHeader) {
+    throw new Error('No hash file in slpk');
+  }
 
   const fileDataOffset = localFileHeader.fileDataOffset;
   const hashFile = archive.buffer.slice(