@inweb/viewer-three 27.1.1 → 27.1.3

package/src/Viewer/loaders/{GLTFBinaryExtension.ts → GLTFBinaryParser.ts}

@@ -31,61 +31,66 @@
 
 const BINARY_EXTENSION_HEADER_MAGIC = "glTF";
 const BINARY_EXTENSION_HEADER_LENGTH = 12;
-const BINARY_EXTENSION_CHUNK_TYPES = { JSON: 0x4e4f534a, BIN: 0x004e4042 };
+const BINARY_EXTENSION_CHUNK_TYPES = { JSON: 0x4e4f534a, BIN: 0x004e4942 };
 
-export class GLTFBinaryExtension {
-  public content: string;
+export interface GLTFBinaryHeader {
+  magic: string;
+  version: number;
+  length: number;
+}
+
+export class GLTFBinaryParser {
+  public header: GLTFBinaryHeader;
+  public content: Uint8Array;
   public body: ArrayBuffer;
 
   constructor(data: ArrayBuffer) {
-    const headerView = new DataView(data, 0, BINARY_EXTENSION_HEADER_LENGTH);
-    const textDecoder = new TextDecoder();
+    const dataView = new DataView(data, 0);
 
-    const magic = textDecoder.decode(new Uint8Array(data.slice(0, 4)));
+    const textDecoder = new TextDecoder();
+    const magic = textDecoder.decode(new Uint8Array(data, 0, Math.min(4, data.byteLength)));
 
     if (magic !== BINARY_EXTENSION_HEADER_MAGIC) {
-      this.content = textDecoder.decode(data);
+      this.content = new Uint8Array(data);
       return;
     }
 
-    const header = {
+    this.header = {
       magic,
-      version: headerView.getUint32(4, true),
-      length: headerView.getUint32(8, true),
+      version: dataView.getUint32(4, true),
+      length: dataView.getUint32(8, true),
     };
 
-    if (header.magic !== BINARY_EXTENSION_HEADER_MAGIC) {
-      throw new Error("Unsupported glTF-Binary header.");
+    if (this.header.length !== data.byteLength) {
+      throw new Error("GLTFBinaryParser: Invalid binary file header.");
     }
-
-    if (header.version < 2.0) {
-      throw new Error("Legacy binary file detected.");
+    if (this.header.version < 2.0) {
+      throw new Error("GLTFBinaryParser: Legacy binary file detected.");
     }
 
-    const chunkContentsLength = header.length - BINARY_EXTENSION_HEADER_LENGTH;
-    const chunkView = new DataView(data, BINARY_EXTENSION_HEADER_LENGTH);
-    let chunkIndex = 0;
+    let offset = BINARY_EXTENSION_HEADER_LENGTH;
 
-    while (chunkIndex < chunkContentsLength) {
-      const chunkLength = chunkView.getUint32(chunkIndex, true);
-      chunkIndex += 4;
+    while (offset < this.header.length) {
+      const chunkLength = dataView.getUint32(offset, true);
+      offset += 4;
 
-      const chunkType = chunkView.getUint32(chunkIndex, true);
-      chunkIndex += 4;
+      const chunkType = dataView.getUint32(offset, true);
+      offset += 4;
 
       if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.JSON) {
-        const contentArray = new Uint8Array(data, BINARY_EXTENSION_HEADER_LENGTH + chunkIndex, chunkLength);
-        this.content = textDecoder.decode(contentArray);
+        this.content = new Uint8Array(data, offset, chunkLength);
       } else if (chunkType === BINARY_EXTENSION_CHUNK_TYPES.BIN) {
-        const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
-        this.body = data.slice(byteOffset, byteOffset + chunkLength);
+        this.body = data.slice(offset, offset + chunkLength);
       }
 
-      chunkIndex += chunkLength;
+      offset += chunkLength;
     }
 
     if (typeof this.content === "undefined") {
-      throw new Error("JSON content not found.");
+      throw new Error("GLTFBinaryParser: JSON content not found.");
+    }
+    if (typeof this.body === "undefined") {
+      throw new Error("GLTFBinaryParser: Binary buffer chunk not found or type not supported.");
     }
   }
 }

package/src/Viewer/loaders/GLTFCloudDynamicLoader.ts

@@ -28,6 +28,7 @@ import { Viewer } from "../Viewer";
 import { DynamicModelImpl } from "./DynamicGltfLoader/DynamicModelImpl";
 import { DynamicGltfLoader } from "./DynamicGltfLoader/DynamicGltfLoader.js";
 import { GltfStructure } from "./DynamicGltfLoader/GltfStructure.js";
+import { JSONStreamParser } from "./JSONStreamParser";
 
 export class GLTFCloudDynamicLoader extends Loader {
   public viewer: Viewer;
@@ -86,20 +87,20 @@ export class GLTFCloudDynamicLoader extends Loader {
 
     const loadController = {
       loadJson: async () => {
-        const progress = (progress: number) => {
+        const jsonParser = new JSONStreamParser();
+
+        const progress = (progress: number, chunk: Uint8Array) => {
+          jsonParser.write(chunk);
           this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
         };
 
-        const arrayBuffer = await model.downloadResource(
-          model.database,
-          progress,
-          this.gltfLoader.getAbortController().signal
-        );
+        await model.downloadResource(model.database, progress, this.gltfLoader.getAbortController().signal);
 
-        const text = new TextDecoder().decode(arrayBuffer);
-        const json = JSON.parse(text);
+        if (!jsonParser.json) {
+          throw new Error("GLTFCloudDynamicLoader: JSON content not found or invalid.");
+        }
 
-        return json;
+        return jsonParser.json;
       },
 
       loadBinaryData: (requests) => {

package/src/Viewer/loaders/GLTFFileDynamicLoader.ts

@@ -29,14 +29,14 @@ import { DynamicModelImpl } from "./DynamicGltfLoader/DynamicModelImpl";
 import { DynamicGltfLoader } from "./DynamicGltfLoader/DynamicGltfLoader.js";
 import { GltfStructure } from "./DynamicGltfLoader/GltfStructure.js";
 import { GLTFLoadingManager, GLTFLoadParams } from "./GLTFLoadingManager";
-import { GLTFBinaryExtension } from "./GLTFBinaryExtension";
+import { GLTFBinaryParser } from "./GLTFBinaryParser";
+import { JSONStreamParser } from "./JSONStreamParser";
 import { RangesLoader } from "./RangesLoader";
 
 export class GLTFFileDynamicLoader extends Loader {
   public viewer: Viewer;
   private gltfLoader: DynamicGltfLoader;
   private manager: GLTFLoadingManager;
-  private gltf: any;
   private glb: ArrayBuffer;
 
   constructor(viewer: Viewer) {
@@ -104,15 +104,16 @@ export class GLTFFileDynamicLoader extends Loader {
 
         const data = await loader.loadAsync(this.manager.fileURL, progress);
 
-        const extension = new GLTFBinaryExtension(data as ArrayBuffer);
-        this.gltf = JSON.parse(extension.content);
-        this.glb = extension.body;
+        const binaryParser = new GLTFBinaryParser(data as ArrayBuffer);
+        const jsonParser = new JSONStreamParser(binaryParser.content);
 
-        if (/\.glb$/i.test(this.manager.fileURL) && !this.glb) {
-          throw new Error("GLTFFileDynamicLoader: Binary buffer chunk not found or type not supported.");
+        if (!jsonParser.json) {
+          throw new Error("GLTFFileDynamicLoader: JSON content not found or invalid.");
         }
 
-        return this.gltf;
+        this.glb = binaryParser.body;
+
+        return jsonParser.json;
       },
 
       loadBinaryData: (ranges, uri = "") => {

package/src/Viewer/loaders/JSONStreamParser.ts

@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
+// All rights reserved.
+//
+// This software and its documentation and related materials are owned by
+// the Alliance. The software may only be incorporated into application
+// programs owned by members of the Alliance, subject to a signed
+// Membership Agreement and Supplemental Software License Agreement with the
+// Alliance. The structure and organization of this software are the valuable
+// trade secrets of the Alliance and its suppliers. The software is also
+// protected by copyright law and international treaty provisions. Application
+// programs incorporating this software must include the following statement
+// with their copyright notices:
+//
+//   This application incorporates Open Design Alliance software pursuant to a
+//   license agreement with Open Design Alliance.
+//   Open Design Alliance Copyright (C) 2002-2025 by Open Design Alliance.
+//   All rights reserved.
+//
+// By use of this software, its documentation or related materials, you
+// acknowledge and accept the above terms.
+///////////////////////////////////////////////////////////////////////////////
+
+import { JSONParser } from "@streamparser/json";
+
+export class JSONStreamParser extends JSONParser {
+  public json: any;
+
+  constructor(data?: Uint8Array) {
+    super();
+
+    this.onValue = ({ value, stack }) => {
+      if (stack.length === 0) this.json = value;
+    };
+
+    if (data) this.write(data);
+  }
+}

package/lib/Viewer/loaders/GLTFBinaryExtension.d.ts

@@ -1,5 +0,0 @@
-export declare class GLTFBinaryExtension {
-    content: string;
-    body: ArrayBuffer;
-    constructor(data: ArrayBuffer);
-}