@lingbi/studio 0.9.0 → 0.9.1

package/index.js

@@ -32221,6 +32221,85 @@ class OBJLoader extends Loader {
     return container;
   }
 }
+class StreamingResourceReader {
+  async readText(url, signal, progress) {
+    const response = await this.fetchOk(url, signal);
+    const streamedBody = this.getStreamedBody(response, progress);
+    if (streamedBody === null) {
+      return response.text();
+    }
+    return new TextDecoder().decode(
+      await this.readStreamingBody(
+        streamedBody.stream,
+        streamedBody.contentLength,
+        streamedBody.progress
+      )
+    );
+  }
+  async readArrayBuffer(url, signal, progress) {
+    const response = await this.fetchOk(url, signal);
+    const streamedBody = this.getStreamedBody(response, progress);
+    if (streamedBody === null) {
+      return response.arrayBuffer();
+    }
+    const bytes = await this.readStreamingBody(
+      streamedBody.stream,
+      streamedBody.contentLength,
+      streamedBody.progress
+    );
+    return bytes.buffer;
+  }
+  async fetchOk(url, signal) {
+    const response = await fetch(url, { signal });
+    if (!response.ok) {
+      throw new Error(`Unable to load resource: ${url}`);
+    }
+    return response;
+  }
+  getStreamedBody(response, progress) {
+    if (progress === void 0) {
+      return null;
+    }
+    const contentLength = this.parseContentLength(response);
+    if (contentLength === void 0) {
+      return null;
+    }
+    const stream = response.body;
+    return stream === null ? null : { contentLength, progress, stream };
+  }
+  async readStreamingBody(stream, contentLength, progress) {
+    const reader = stream.getReader();
+    const chunks = [];
+    let loaded = 0;
+    for (; ; ) {
+      const next = await reader.read();
+      if (next.done) {
+        break;
+      }
+      chunks.push(next.value);
+      loaded += next.value.byteLength;
+      progress(Math.min(1, loaded / contentLength));
+    }
+    return this.mergeChunks(chunks, loaded);
+  }
+  mergeChunks(chunks, total) {
+    const merged = new Uint8Array(total);
+    let offset = 0;
+    for (const chunk of chunks) {
+      merged.set(chunk, offset);
+      offset += chunk.byteLength;
+    }
+    return merged;
+  }
+  parseContentLength(response) {
+    const raw = response.headers.get("Content-Length");
+    if (raw === null) {
+      return void 0;
+    }
+    const parsed = Number(raw);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
+  }
+}
 const DEFAULT_MODEL_COLOR$1 = 10265519;
 const DEFAULT_POINT_SIZE$1 = 3;
 class TextureLoadMonitor {
@@ -32321,6 +32400,7 @@ class TextureLoadMonitor {
 }
 class ObjLoader {
   parser;
+  resourceReader = new StreamingResourceReader();
   constructor(parser = new OBJLoader()) {
     this.parser = parser;
   }
@@ -32345,7 +32425,7 @@ class ObjLoader {
     let warnings = [];
     try {
       const objFetchStage = performanceTrace.startStage("obj-fetch", role);
-      const objSource = await this.loadText(resources.objUrl, signal);
+      const objSource = await this.loadText(resources.objUrl, signal, progress);
       performanceTrace.endStage(objFetchStage, "success");
       progress?.markModelFetched();
       this.assertNotCancelled(signal);
@@ -32777,14 +32857,12 @@ class ObjLoader {
     }
     return outcome;
   }
-  async loadText(url, signal) {
-    const response = await fetch(url, {
-      signal
-    });
-    if (!response.ok) {
-      throw new Error(`Unable to load OBJ resource: ${url}`);
-    }
-    return response.text();
+  async loadText(url, signal, progress) {
+    return this.resourceReader.readText(
+      url,
+      signal,
+      progress === void 0 ? void 0 : progress.markModelFetchProgress.bind(progress)
+    );
   }
   getImportPerformanceFailureStatus(signal) {
     return signal.aborted ? "cancelled" : "failure";
@@ -33677,6 +33755,7 @@ const DEFAULT_POINT_SIZE = 3;
 const MAX_HEADER_BYTES = 65536;
 class PlyLoader {
   parser;
+  resourceReader = new StreamingResourceReader();
   textureLoader;
   constructor(parser = new PLYLoader(), textureLoader = new PlyTextureLoader()) {
     this.parser = parser;
@@ -33689,7 +33768,7 @@ class PlyLoader {
         success: false
       };
     }
-    const source = await this.fetchSource(resources.plyUrl, signal);
+    const source = await this.fetchSource(resources.plyUrl, signal, progress);
     if (!(source instanceof ArrayBuffer)) {
       return source;
     }
@@ -33815,16 +33894,13 @@ class PlyLoader {
       warnings: []
     };
   }
-  async fetchSource(url, signal) {
+  async fetchSource(url, signal, progress) {
     try {
-      const response = await fetch(url, { signal });
-      if (!response.ok) {
-        return {
-          code: ObjImportFailureCode$1.InvalidSource,
-          success: false
-        };
-      }
-      return await response.arrayBuffer();
+      return await this.resourceReader.readArrayBuffer(
+        url,
+        signal,
+        progress === void 0 ? void 0 : progress.markModelFetchProgress.bind(progress)
+      );
     } catch {
       return {
         code: signal.aborted ? ObjImportFailureCode$1.Cancelled : ObjImportFailureCode$1.InvalidSource,
@@ -33887,6 +33963,12 @@ class RoleImportProgressReporter {
     this.tracker.setRolePosition(this.role, this.profile.materialsPosition);
     this.reportTexturePosition();
   }
+  markModelFetchProgress(fraction) {
+    this.tracker.setRolePosition(
+      this.role,
+      this.profile.fetchedPosition * this.clampFraction(fraction)
+    );
+  }
   markModelFetched() {
     this.tracker.setRolePosition(this.role, this.profile.fetchedPosition);
   }
@@ -33909,6 +33991,9 @@ class RoleImportProgressReporter {
       this.profile.parsedPosition + textureSpan * settledShare
     );
   }
+  clampFraction(fraction) {
+    return Math.max(0, Math.min(1, fraction));
+  }
 }
 class SimulationSnapshotFactory {
   constructor(scheduler) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lingbi/studio",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "repository": {
         "type": "git",
         "url": "https://github.com/genewanggang-sudo/lingbi-shitou.git"