From 4712bb82e570c2a9b60fad91742e52b06e22bb2e Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 30 Aug 2026 17:02:43 +0000 Subject: [PATCH 01/41] Harden reply asset loading and previews --- src/components/load3d/modelThumbnail.test.ts | 58 +++++++++---------- src/components/load3d/modelThumbnail.ts | 32 +++++----- .../agent/message/ReplyAssetGroup.test.ts | 26 +++++++-- .../agent/message/ReplyAssetGroup.vue | 25 ++++++-- 4 files changed, 80 insertions(+), 61 deletions(-) diff --git a/src/components/load3d/modelThumbnail.test.ts b/src/components/load3d/modelThumbnail.test.ts index 169c0c53007..d911656abe0 100644 --- a/src/components/load3d/modelThumbnail.test.ts +++ b/src/components/load3d/modelThumbnail.test.ts @@ -2,13 +2,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { generateModelThumbnail } from './modelThumbnail' -const isAssetPreviewSupported = vi.hoisted(() => vi.fn(() => false)) -const persistThumbnail = vi.hoisted(() => vi.fn(async () => {})) -vi.mock('@/platform/assets/utils/assetPreviewUtil', () => ({ - isAssetPreviewSupported, - persistThumbnail -})) - const createLoad3d = vi.hoisted(() => vi.fn()) vi.mock('@/extensions/core/load3d/createLoad3d', () => ({ createLoad3d })) @@ -24,38 +17,17 @@ function mockInstance(overrides: Record = {}) { describe('generateModelThumbnail', () => { beforeEach(() => { createLoad3d.mockReset() - isAssetPreviewSupported.mockReset().mockReturnValue(false) - persistThumbnail.mockReset() }) it('renders offscreen, returns the data url, and disposes the instance', async () => { const instance = mockInstance() createLoad3d.mockReturnValue(instance) - const result = await generateModelThumbnail( - '/api/view?filename=a.glb', - 'a.glb' - ) + const result = await generateModelThumbnail('/api/view?filename=a.glb') expect(result).toBe('data:image/png;base64,thumb') expect(instance.loadModel).toHaveBeenCalledWith('/api/view?filename=a.glb') expect(instance.remove).toHaveBeenCalledTimes(1) - expect(persistThumbnail).not.toHaveBeenCalled() - }) - - it('persists the thumbnail when the asset API is available', async () => { - isAssetPreviewSupported.mockReturnValue(true) - vi.stubGlobal( - 'fetch', - vi.fn().mockResolvedValue({ blob: () => Promise.resolve(new Blob()) }) - ) - createLoad3d.mockReturnValue(mockInstance()) - - await generateModelThumbnail('/a.glb', 'a.glb') - - await vi.waitFor(() => - expect(persistThumbnail).toHaveBeenCalledWith('a.glb', expect.any(Blob)) - ) }) it('returns null and still disposes when the model fails to load', async () => { @@ -64,7 +36,7 @@ describe('generateModelThumbnail', () => { }) createLoad3d.mockReturnValue(instance) - const result = await generateModelThumbnail('/broken.glb', 'broken.glb') + const result = await generateModelThumbnail('/broken.glb') expect(result).toBeNull() expect(instance.remove).toHaveBeenCalledTimes(1) @@ -80,8 +52,8 @@ describe('generateModelThumbnail', () => { const second = mockInstance() createLoad3d.mockReturnValueOnce(first).mockReturnValueOnce(second) - const firstRun = generateModelThumbnail('/one.glb', 'one.glb') - const secondRun = generateModelThumbnail('/two.glb', 'two.glb') + const firstRun = generateModelThumbnail('/one.glb') + const secondRun = generateModelThumbnail('/two.glb') await vi.waitFor(() => expect(createLoad3d).toHaveBeenCalledTimes(1)) releaseFirst() @@ -90,4 +62,26 @@ describe('generateModelThumbnail', () => { expect(createLoad3d).toHaveBeenCalledTimes(2) }) + + it('[11-T5 regression] times out a stuck load, disposes it, and advances the queue', async () => { + vi.useFakeTimers() + try { + const first = mockInstance({ + loadModel: vi.fn(() => new Promise(() => {})) + }) + const second = mockInstance() + createLoad3d.mockReturnValueOnce(first).mockReturnValueOnce(second) + + const firstRun = generateModelThumbnail('/stuck.glb') + const secondRun = generateModelThumbnail('/next.glb') + await vi.advanceTimersByTimeAsync(10_000) + + await expect(firstRun).resolves.toBeNull() + await expect(secondRun).resolves.toBe('data:image/png;base64,thumb') + expect(first.remove).toHaveBeenCalledOnce() + expect(second.remove).toHaveBeenCalledOnce() + } finally { + vi.useRealTimers() + } + }) }) diff --git a/src/components/load3d/modelThumbnail.ts b/src/components/load3d/modelThumbnail.ts index 702ea17b043..2c73d6779de 100644 --- a/src/components/load3d/modelThumbnail.ts +++ b/src/components/load3d/modelThumbnail.ts @@ -1,9 +1,5 @@ -import { - isAssetPreviewSupported, - persistThumbnail -} from '@/platform/assets/utils/assetPreviewUtil' - let queue: Promise = Promise.resolve() +const MODEL_LOAD_TIMEOUT_MS = 10_000 /** * Render a model to a thumbnail data URL offscreen, without opening the @@ -12,18 +8,14 @@ let queue: Promise = Promise.resolve() * Resolves null when the model cannot be rendered. */ export function generateModelThumbnail( - modelUrl: string, - assetName: string + modelUrl: string ): Promise { - const run = queue.then(() => renderThumbnail(modelUrl, assetName)) + const run = queue.then(() => renderThumbnail(modelUrl)) queue = run.catch(() => null) return run } -async function renderThumbnail( - modelUrl: string, - assetName: string -): Promise { +async function renderThumbnail(modelUrl: string): Promise { try { const { createLoad3d } = await import('@/extensions/core/load3d/createLoad3d') @@ -33,14 +25,16 @@ async function renderThumbnail( isViewerMode: true }) try { - await load3d.loadModel(modelUrl) + await Promise.race([ + load3d.loadModel(modelUrl), + new Promise((_, reject) => + setTimeout( + () => reject(new Error('Model thumbnail load timed out')), + MODEL_LOAD_TIMEOUT_MS + ) + ) + ]) const dataUrl = await load3d.captureThumbnail(256, 256) - if (isAssetPreviewSupported()) { - void fetch(dataUrl) - .then((response) => response.blob()) - .then((blob) => persistThumbnail(assetName, blob)) - .catch(() => {}) - } return dataUrl } finally { load3d.remove() diff --git a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts index 9440fa4b054..9960275e902 100644 --- a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts +++ b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.test.ts @@ -212,10 +212,7 @@ describe('ReplyAssetGroup', () => { const thumb = await screen.findByRole('img', { name: 'mesh.glb' }) expect(thumb).toHaveAttribute('src', 'data:image/png;base64,gen') - expect(generateModelThumbnail).toHaveBeenCalledWith( - 'https://x/mesh.glb', - 'mesh.glb' - ) + expect(generateModelThumbnail).toHaveBeenCalledWith('https://x/mesh.glb') }) it('refreshes the tile thumbnail after the viewer closes', async () => { @@ -261,4 +258,25 @@ describe('ReplyAssetGroup', () => { expect(thumbs()).toHaveLength(12) expect(toggle()).toHaveTextContent('Show more') }) + + it('[11-T7 regression] generates thumbnails only for currently visible 3D entries', async () => { + isAssetPreviewSupported.mockReturnValue(true) + const models = Array.from({ length: 13 }, (_, n) => ({ + ...model, + url: `https://x/mesh-${n}.glb`, + filename: `mesh-${n}.glb` + })) + renderGroup(models) + await waitFor(() => expect(generateModelThumbnail).toHaveBeenCalled()) + expect(generateModelThumbnail).not.toHaveBeenCalledWith( + 'https://x/mesh-12.glb' + ) + + await userEvent.click(toggle()!) + await waitFor(() => + expect(generateModelThumbnail).toHaveBeenCalledWith( + 'https://x/mesh-12.glb' + ) + ) + }) }) diff --git a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue index f6e710d95c6..8c46334cbb2 100644 --- a/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue +++ b/src/workbench/extensions/agent/components/agent/message/ReplyAssetGroup.vue @@ -1,5 +1,11 @@