@manycore/aholo-viewer 1.0.0-alpha.0 → 1.0.0

package/dist/index.js

@@ -41331,7 +41331,7 @@ var init_Splatting = __esm({
         return this.enabled && (this.shouldRenderNextFrame || this.isSortDirty || this.isSorting);
       }
       async flushSortTask() {
-        if (this.sortCurrentVersion === this.sortLastVersion || this.sortTaskRunning) {
+        if (this.sortCurrentVersion === this.sortLastVersion || this.sortTaskRunning || !this.pendingSortTask) {
           return;
         }
         this.sortTaskRunning = true;
@@ -46184,7 +46184,7 @@ var init_SnapshotRendererV2 = __esm({
         }
         const splat = scene.splatManager.splats[0];
         const { promise, resolve } = deferred();
-        splat.on(SplatSortedEvent, resolve);
+        splat.once(SplatSortedEvent, resolve);
         const ratio = this.realRatio;
         const renderSize = {
           width: Math.floor(size.width * ratio),
@@ -46288,7 +46288,9 @@ var init_SnapshotRendererV2 = __esm({
             }
           }
           const ctx = { drawableList, scene, camera: renderCamera, size, freeables };
-          await this.prerender(ctx);
+          if (ctx.scene.splatManager.splatCounts) {
+            await this.prerender(ctx);
+          }
           const target4 = this.inner_render(ctx);
           const resultBuffer = new Uint8Array(size.width * size.height * 4);
           const projectionMatrix = renderCamera.projectionMatrix.clone();
@@ -46342,7 +46344,7 @@ var require_package = __commonJS({
   "../../external/egs-core/packages/egs/package.json"(exports, module) {
     module.exports = {
       name: "@qunhe/egs",
-      version: "1.2.84",
+      version: "1.2.87",
       description: "Manycore EGS Graphics System",
       license: "MIT",
       main: "index.js",
@@ -46364,7 +46366,7 @@ var require_package = __commonJS({
       },
       release: {
         scripts: {
-          "pre-release": "pnpm build:release"
+          "pre-release": "echo build"
         },
         publishRoot: "./build"
       }
@@ -66863,6 +66865,13 @@ var ResourceManager3 = class {
 };
 
 // ../../external/egs-core/packages/utils/splat-utils/lod/index.ts
+var DEFAULT_DISTANCE_STEP = [{
+  distance: 5,
+  step: 3
+}, {
+  distance: 10,
+  step: 2
+}];
 function DefaultLoadResource(url7) {
   const type = detectSplatFileType(url7, new Uint8Array());
   return parseSplatData(type, url7);
@@ -66990,6 +66999,7 @@ var LodSplat = class {
     this.behindPenalty = config?.behindPenalty ?? 0.1;
     this.behindTolerance = config?.behindTolerance ?? -0.2;
     this.behindDistanceTolerance = config?.behindDistanceTolerance ?? 2;
+    this.distanceStep = config?.distanceStep ?? DEFAULT_DISTANCE_STEP;
     this.hysteresisTicks = config?.hysteresisTicks ?? 4;
     this.schedulerParallelCounts = config?.schedulerParallelCounts ?? 4;
     this.schedulerExistingTaskLimit = config?.schedulerExistingTaskLimit ?? 64;
@@ -67052,7 +67062,8 @@ var LodSplat = class {
       outsidePenalty,
       behindPenalty,
       behindTolerance,
-      behindDistanceTolerance
+      behindDistanceTolerance,
+      distanceStep
     } = this;
     camera.updateMatrixWorld();
     const { position: cameraPos2, quaternion: cameraQuat } = camera;
@@ -67060,27 +67071,60 @@ var LodSplat = class {
     const cameraDir = new Vector3(0, 0, -1).applyQuaternion(cameraQuat);
     const nodeWeights = nodes.map((node, idx) => {
       const closestPoint = node.box.clampPoint(cameraPos2, tempVec32);
-      const dist = cameraPos2.distanceTo(closestPoint);
+      const insideBox = node.box.containsPoint(cameraPos2);
+      const dist = insideBox ? 0 : cameraPos2.distanceTo(closestPoint);
       const dirDot = cameraDir.dot(closestPoint.sub(cameraPos2).normalize());
       const isInside = frustum.intersectsBox(node.box);
-      const isBehind = dirDot < behindTolerance && dist > behindDistanceTolerance;
+      const isBehind = !insideBox && dirDot < behindTolerance && dist > behindDistanceTolerance;
       const weight = node.weight / (1 + 0.1 * dist * dist) * (isInside ? 1 : outsidePenalty * (isBehind ? behindPenalty : 1));
-      return { idx, node, weight, isInside, isBehind };
+      return { idx, node, weight, isInside, isBehind, dist };
     }).sort((a, b) => b.weight - a.weight);
+    const steppedNodes = distanceStep.map((e) => ({
+      ...e,
+      nodes: []
+    }));
+    steppedNodes.push({
+      distance: Infinity,
+      step: 1,
+      nodes: []
+    });
+    let stepIndex = 0;
+    for (const node of nodeWeights) {
+      if (!node.isInside) {
+        steppedNodes[steppedNodes.length - 1].nodes.push(node);
+        continue;
+      }
+      if (node.dist <= steppedNodes[stepIndex].distance) {
+        steppedNodes[stepIndex].nodes.push(node);
+      } else {
+        stepIndex++;
+        steppedNodes[stepIndex].nodes.push(node);
+      }
+    }
     const levels = new Uint8Array(nodes.length).fill(maxLevel);
     let insideOnly = true;
     let restBudget = maxBudget - lessUsedBudget;
     while (restBudget > 0) {
       const prev = restBudget;
-      for (let i = 0; i < nodeWeights.length; i++) {
-        const { idx, node: { lods }, isInside } = nodeWeights[i];
-        if (insideOnly && !isInside) {
-          continue;
-        }
-        const level = levels[idx];
-        if (level > minLevel) {
-          restBudget -= lods[level - 1].counts - lods[level].counts;
-          levels[idx] = level - 1;
+      for (const stepped of steppedNodes) {
+        for (let step = 0; step < stepped.step; step++) {
+          for (const node of stepped.nodes) {
+            const { idx, node: { lods }, isInside } = node;
+            if (insideOnly && !isInside) {
+              continue;
+            }
+            const level = levels[idx];
+            if (level > minLevel) {
+              restBudget -= lods[level - 1].counts - lods[level].counts;
+              levels[idx] = level - 1;
+            }
+            if (restBudget <= 0) {
+              break;
+            }
+          }
+          if (restBudget <= 0) {
+            break;
+          }
         }
         if (restBudget <= 0) {
           break;
@@ -67153,18 +67197,22 @@ var LodSplat = class {
 // src/index.ts
 init_egs();
 
-// src/render-cloud/index.ts
-var render_cloud_exports = {};
-__export(render_cloud_exports, {
+// ../render-cloud/src/index.ts
+var src_exports = {};
+__export(src_exports, {
   OfflineRenderClient: () => OfflineRenderClient,
   RenderCloudError: () => RenderCloudError,
   closeStreamKeepalive: () => closeStreamKeepalive,
   createRealtimeSession: () => createRealtimeSession,
+  formatRenderCloudUserError: () => formatRenderCloudUserError,
   matrixColumnsToUsdMatrix4d: () => matrixColumnsToUsdMatrix4d,
+  readRenderCloudApiErrorDetails: () => readRenderCloudApiErrorDetails,
+  readRenderCloudApiErrorMessage: () => readRenderCloudApiErrorMessage,
+  readRenderCloudApiErrorReason: () => readRenderCloudApiErrorReason,
   usdMatrix4dToMatrixColumns: () => usdMatrix4dToMatrixColumns
 });
 
-// src/render-cloud/constants.ts
+// ../render-cloud/src/constants.ts
 var RENDER_CLOUD_V1_PATHS = {
   offlineJobs: "/jobs",
   streams: "/streams",
@@ -67176,7 +67224,7 @@ var RENDER_CLOUD_DEFAULT_MAX_PATCHES_PER_MINUTE = 60;
 var RENDER_CLOUD_DEFAULT_PATCH_THROTTLE_MS = 1e3;
 var RENDER_CLOUD_MAX_STREAM_RESOLUTION_LONG_EDGE = 1920;
 
-// src/render-cloud/utils.ts
+// ../render-cloud/src/utils.ts
 var RenderCloudError = class extends Error {
   constructor(message, status, body) {
     super(message);
@@ -67210,26 +67258,62 @@ function readLegacyGatewayFailure(body) {
   const message = record.m;
   return typeof message === "string" && message.trim() ? message.trim() : `gateway error (${code})`;
 }
-function readRenderCloudApiErrorMessage(body) {
+function unwrapRenderCloudApiErrorRecord(body) {
   if (!body || typeof body !== "object") {
     return void 0;
   }
   const record = body;
   const nested = record.error;
-  if (nested && typeof nested === "object" && "message" in nested) {
-    const nestedMessage = nested.message;
-    if (typeof nestedMessage === "string" && nestedMessage.trim()) {
-      return nestedMessage.trim();
-    }
+  if (nested && typeof nested === "object") {
+    return nested;
+  }
+  if ("message" in record || "code" in record || "status" in record || "details" in record) {
+    return record;
+  }
+  return void 0;
+}
+function readRenderCloudApiErrorDetails(body) {
+  const record = unwrapRenderCloudApiErrorRecord(body);
+  if (!record) {
+    return void 0;
+  }
+  const details = record.details;
+  if (details && typeof details === "object" && !Array.isArray(details)) {
+    return details;
+  }
+  return void 0;
+}
+function readRenderCloudApiErrorReason(body) {
+  const reason = readRenderCloudApiErrorDetails(body)?.reason;
+  return typeof reason === "string" && reason.trim() ? reason.trim() : void 0;
+}
+function readRenderCloudApiErrorMessage(body) {
+  const record = unwrapRenderCloudApiErrorRecord(body);
+  if (!record) {
+    return void 0;
   }
   const message = record.message;
   return typeof message === "string" && message.trim() ? message.trim() : void 0;
 }
+function formatRenderCloudUserError(body, options) {
+  const message = readRenderCloudApiErrorMessage(body);
+  const reason = readRenderCloudApiErrorReason(body);
+  return message ?? reason ?? options?.fallbackMessage;
+}
 function readGatewayErrorMessage(body) {
   const legacy = readLegacyGatewayFailure(body);
   if (legacy) {
     return legacy;
   }
+  if (body && typeof body === "object") {
+    const record = body;
+    if (record.error) {
+      const operationError = readRenderCloudApiErrorMessage(record.error);
+      if (operationError) {
+        return operationError;
+      }
+    }
+  }
   return readRenderCloudApiErrorMessage(body);
 }
 function safeJsonParse(text) {
@@ -67277,7 +67361,7 @@ var PatchRateLimiter = class {
 _maxPerMinute = new WeakMap();
 _timestamps = new WeakMap();
 
-// src/render-cloud/usd.ts
+// ../render-cloud/src/usd.ts
 function matrixColumnsToUsdMatrix4d(columns) {
   const rows = [
     [0, 0, 0, 0],
@@ -67399,7 +67483,7 @@ function patchUsdCamera(usda, camera, options) {
   return next;
 }
 
-// src/render-cloud/client.ts
+// ../render-cloud/src/client.ts
 function resolveConfig(config) {
   return {
     origin: config.origin.replace(/\/$/, ""),
@@ -67421,7 +67505,7 @@ var RenderCloudClient = class {
   get resolved() {
     return __privateGet(this, _config);
   }
-  /** `POST /rendercloud/v1/streams` 鈥?submit (no `operationId`). */
+  /** `POST /rendercloud/v1/streams` — submit (no `operationId`). */
   submitStream(usda, requestId) {
     const body = {
       requestId: requestId ?? __privateGet(this, _config).createRequestId(),
@@ -67429,12 +67513,12 @@ var RenderCloudClient = class {
     };
     return this.json(RENDER_CLOUD_V1_PATHS.streams, { method: "POST", json: body });
   }
-  /** `POST /rendercloud/v1/streams` 鈥?poll (`operationId` only). */
+  /** `POST /rendercloud/v1/streams` — poll (`operationId` only). */
   pollStream(operationId) {
     const body = { operationId };
     return this.json(RENDER_CLOUD_V1_PATHS.streams, { method: "POST", json: body });
   }
-  /** `POST /rendercloud/v1/streams/{sessionId}:push` 鈥?scene/camera updates. */
+  /** `POST /rendercloud/v1/streams/{sessionId}:push` — scene/camera updates. */
   pushStream(sessionId, usda, requestId) {
     const body = {
       requestId: requestId ?? __privateGet(this, _config).createRequestId(),
@@ -67446,7 +67530,7 @@ var RenderCloudClient = class {
   closeStream(sessionId) {
     return this.json(RENDER_CLOUD_V1_PATHS.streamClose(sessionId), { method: "DELETE" });
   }
-  /** `POST /rendercloud/v1/jobs` 鈥?submit offline render. */
+  /** `POST /rendercloud/v1/jobs` — submit offline render. */
   submitOfflineJob(usda, imgSize, requestId) {
     const body = {
       requestId: requestId ?? __privateGet(this, _config).createRequestId(),
@@ -67455,7 +67539,7 @@ var RenderCloudClient = class {
     };
     return this.json(RENDER_CLOUD_V1_PATHS.offlineJobs, { method: "POST", json: body });
   }
-  /** `POST /rendercloud/v1/jobs` 鈥?poll offline job. */
+  /** `POST /rendercloud/v1/jobs` — poll offline job. */
   pollOfflineJob(operationId) {
     const body = { operationId };
     return this.json(RENDER_CLOUD_V1_PATHS.offlineJobs, { method: "POST", json: body });
@@ -67538,7 +67622,7 @@ function formatErrorMessage(status, body, rawText) {
   return `Render Cloud request failed (${status})`;
 }
 
-// src/render-cloud/streaming.ts
+// ../render-cloud/src/streaming.ts
 function buildStreamingWebSocketUrl(host, nodeId, token) {
   const nid = encodeURIComponent(nodeId);
   const tok = encodeURIComponent(token);
@@ -67658,7 +67742,7 @@ function isFatalStreamingCode(code) {
   return code === "1000" || code === "1001" || code === "1003";
 }
 
-// src/render-cloud/realtime.ts
+// ../render-cloud/src/realtime.ts
 async function createRealtimeSession(config, options) {
   const client = new RenderCloudClient(config);
   const resolved = client.resolved;
@@ -67674,6 +67758,7 @@ async function createRealtimeSession(config, options) {
   let state = "creating";
   let streaming;
   let closed = false;
+  let serverCloseStarted = false;
   let readyPromise;
   let patchTimer;
   let pendingPatch = false;
@@ -67690,57 +67775,89 @@ async function createRealtimeSession(config, options) {
   if (options.onStateChange) {
     stateHandlers.add(options.onStateChange);
   }
-  const submitOperation = await client.submitStream(usda);
-  const operationId = submitOperation.operationId;
-  if (operationId === void 0 || operationId === null || String(operationId).length === 0) {
-    const gatewayMessage = readGatewayErrorMessage(submitOperation);
-    if (gatewayMessage) {
-      throw new Error(`Render Cloud: ${gatewayMessage}`);
-    }
-    throw new Error("Render Cloud did not return an operationId.");
-  }
-  setState("polling");
-  const streamResult = await pollStreamUntilActive(client, operationId, pollInterval, pollTimeout);
-  sessionId = streamResult.sessionId || String(operationId);
-  const wsUrl = resolveStreamingUrl(
-    buildStreamingWebSocketUrl(streamResult.host, streamResult.nodeId, streamResult.token),
-    resolved
-  );
-  setState("connecting");
-  await connectStreaming(wsUrl, streamResult.streamId);
-  setState("ready");
-  return {
-    get sessionId() {
-      return sessionId;
-    },
-    get state() {
-      return state;
-    },
-    ready() {
-      return readyPromise ?? Promise.resolve();
-    },
-    push(nextUsda) {
-      usda = nextUsda;
-      schedulePatch();
-    },
-    pushCamera(camera, patchOptions) {
-      usda = patchUsdCamera(usda, camera, patchOptions);
-      schedulePatch();
-    },
-    onFrame(handler) {
-      frameHandlers.add(handler);
-      return () => frameHandlers.delete(handler);
-    },
-    onError(handler) {
-      errorHandlers.add(handler);
-      return () => errorHandlers.delete(handler);
-    },
-    onStateChange(handler) {
-      stateHandlers.add(handler);
-      return () => stateHandlers.delete(handler);
-    },
-    close: () => closeSession()
+  throwIfRealtimeAborted(options.signal);
+  let unlinkAbortSignal = () => {
   };
+  unlinkAbortSignal = bindAbortSignal(options.signal, () => {
+    void closeSession();
+  });
+  try {
+    const submitOperation = await client.submitStream(usda);
+    const operationId = submitOperation.operationId;
+    if (operationId === void 0 || operationId === null || String(operationId).length === 0) {
+      const apiError = submitOperation.error;
+      if (apiError) {
+        throw new RenderCloudError(
+          apiError.message ?? "Render Cloud stream creation failed.",
+          apiError.code,
+          apiError
+        );
+      }
+      const gatewayMessage = readGatewayErrorMessage(submitOperation);
+      if (gatewayMessage) {
+        throw new RenderCloudError(gatewayMessage, 0, submitOperation);
+      }
+      throw new RenderCloudError("Render Cloud did not return an operationId.", 0, submitOperation);
+    }
+    sessionId = String(operationId);
+    options.onSessionId?.(sessionId);
+    throwIfRealtimeAborted(options.signal);
+    setState("polling");
+    const streamResult = await pollStreamUntilActive(client, sessionId, pollInterval, pollTimeout, options.signal);
+    const activeSessionId = streamResult.sessionId || sessionId;
+    if (activeSessionId !== sessionId) {
+      sessionId = activeSessionId;
+      options.onSessionId?.(sessionId);
+    }
+    const wsUrl = resolveStreamingUrl(
+      buildStreamingWebSocketUrl(streamResult.host, streamResult.nodeId, streamResult.token),
+      resolved
+    );
+    throwIfRealtimeAborted(options.signal);
+    setState("connecting");
+    await connectStreaming(wsUrl, streamResult.streamId);
+    throwIfRealtimeAborted(options.signal);
+    setState("ready");
+    return {
+      get sessionId() {
+        return sessionId;
+      },
+      get state() {
+        return state;
+      },
+      ready() {
+        return readyPromise ?? Promise.resolve();
+      },
+      push(nextUsda) {
+        usda = nextUsda;
+        schedulePatch();
+      },
+      pushCamera(camera, patchOptions) {
+        usda = patchUsdCamera(usda, camera, patchOptions);
+        schedulePatch();
+      },
+      onFrame(handler) {
+        frameHandlers.add(handler);
+        return () => frameHandlers.delete(handler);
+      },
+      onError(handler) {
+        errorHandlers.add(handler);
+        return () => errorHandlers.delete(handler);
+      },
+      onStateChange(handler) {
+        stateHandlers.add(handler);
+        return () => stateHandlers.delete(handler);
+      },
+      close: () => closeSession()
+    };
+  } catch (error) {
+    if (sessionId) {
+      await closeSession();
+    } else {
+      unlinkAbortSignal();
+    }
+    throw error;
+  }
   function setState(next) {
     state = next;
     for (const handler of stateHandlers) {
@@ -67800,6 +67917,7 @@ async function createRealtimeSession(config, options) {
     readyPromise = new Promise((resolve, reject) => {
       let settled = false;
       const timeout = setTimeout(() => {
+        settled = true;
         reject(new Error("Timed out waiting for Render Cloud streaming to become ready."));
       }, pollTimeout);
       streaming = new StreamingConnection({
@@ -67824,9 +67942,19 @@ async function createRealtimeSession(config, options) {
         },
         onError: (error) => {
           clearTimeout(timeout);
-          reject(error);
+          if (!settled) {
+            settled = true;
+            reject(error);
+          }
         },
         onClose: () => {
+          clearTimeout(timeout);
+          if (!settled) {
+            settled = true;
+            reject(
+              closed ? createRealtimeAbortError() : new Error("Render Cloud streaming WebSocket closed before ready.")
+            );
+          }
           if (!closed) {
             setState("closed");
           }
@@ -67836,16 +67964,22 @@ async function createRealtimeSession(config, options) {
     await readyPromise;
   }
   async function closeSession() {
-    if (closed) {
+    if (closed && (serverCloseStarted || !sessionId)) {
       return;
     }
     closed = true;
+    unlinkAbortSignal();
     if (patchTimer !== void 0) {
       clearTimeout(patchTimer);
       patchTimer = void 0;
     }
     streaming?.close(1e3, "client-close");
     streaming = void 0;
+    if (!sessionId || serverCloseStarted) {
+      setState("closed");
+      return;
+    }
+    serverCloseStarted = true;
     try {
       await client.closeStream(sessionId);
     } catch (error) {
@@ -67854,17 +67988,24 @@ async function createRealtimeSession(config, options) {
     setState("closed");
   }
 }
-async function pollStreamUntilActive(client, operationId, intervalMs, timeoutMs) {
+async function pollStreamUntilActive(client, operationId, intervalMs, timeoutMs, signal) {
   const started = Date.now();
   while (Date.now() - started < timeoutMs) {
+    throwIfRealtimeAborted(signal);
     const operation = await client.pollStream(operationId);
+    throwIfRealtimeAborted(signal);
     if (operation.done && operation.error) {
-      throw new Error(operation.error.message ?? "Render Cloud stream creation failed.");
+      const apiError = operation.error;
+      throw new RenderCloudError(
+        apiError.message ?? "Render Cloud stream creation failed.",
+        apiError.code,
+        apiError
+      );
     }
     if (operation.done && operation.result) {
       const result = operation.result;
       if (result.status === "FAILED" || result.status === "CLOSED") {
-        throw new Error(`Render Cloud stream creation failed (${result.status}).`);
+        throw new RenderCloudError(`Render Cloud stream creation failed (${result.status}).`, 0, result);
       }
       if (result.status === "ACTIVE" && result.host && result.nodeId && result.streamId && result.token) {
         return {
@@ -67881,15 +68022,56 @@ async function pollStreamUntilActive(client, operationId, intervalMs, timeoutMs)
         `Render Cloud stream ended without ACTIVE credentials (status=${result.status ?? "unknown"}).`
       );
     }
-    await sleep2(intervalMs);
+    await sleepWithAbort(intervalMs, signal);
   }
   throw new Error("Timed out waiting for Render Cloud stream to become ACTIVE.");
 }
 function resolveStreamingUrl(url7, resolved) {
   return resolved.transformStreamingUrl ? resolved.transformStreamingUrl(url7) : url7;
 }
+function bindAbortSignal(signal, onAbort) {
+  if (!signal) {
+    return () => {
+    };
+  }
+  if (signal.aborted) {
+    onAbort();
+    return () => {
+    };
+  }
+  signal.addEventListener("abort", onAbort, { once: true });
+  return () => {
+    signal.removeEventListener("abort", onAbort);
+  };
+}
+async function sleepWithAbort(ms, signal) {
+  if (!signal) {
+    await sleep2(ms);
+    return;
+  }
+  throwIfRealtimeAborted(signal);
+  await new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      signal.removeEventListener("abort", abort);
+      resolve();
+    }, ms);
+    const abort = () => {
+      clearTimeout(timeout);
+      reject(createRealtimeAbortError());
+    };
+    signal.addEventListener("abort", abort, { once: true });
+  });
+}
+function throwIfRealtimeAborted(signal) {
+  if (signal?.aborted) {
+    throw createRealtimeAbortError();
+  }
+}
+function createRealtimeAbortError() {
+  return new DOMException("Render Cloud realtime session was aborted.", "AbortError");
+}
 
-// src/render-cloud/offline.ts
+// ../render-cloud/src/offline.ts
 var _client;
 var OfflineRenderClient = class {
   constructor(config) {
@@ -68027,7 +68209,7 @@ export {
   Quaternion,
   Ray,
   Raycaster,
-  render_cloud_exports as RenderCloud,
+  src_exports as RenderCloud,
   SamplerFilter,
   SamplerWrap,
   Scene3D,