@inweb/viewer-three 27.1.1 → 27.1.2

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);
-}