Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
"**/{__test__,__tests__,__fixtures__}/**/*.{ts,tsx}"
],
"rules": {
"comfy/no-import-actual": "error",
"comfy/use-global-pinia": "error"
}
},
Expand Down
1 change: 1 addition & 0 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
"@testing-library/jest-dom": "catalog:",
"@testing-library/user-event": "catalog:",
"@testing-library/vue": "catalog:",
"@total-typescript/shoehorn": "catalog:",
"@types/leaflet": "catalog:",
"@vitejs/plugin-vue": "catalog:",
"astro": "catalog:",
Expand Down
12 changes: 4 additions & 8 deletions apps/website/scripts/router-gemini-video.test.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
import { expect, it, vi } from 'vitest'

import { prepareModelRouterRender } from '../src/config/router-render'
import { loadWorkshopExampleFile } from '../src/config/workshop-example-file'
import { loadWorkshopExampleFile } from '../src/config/workshop-example-file-loader'
import { getRouterWorkshopModelDetail } from '../src/config/workshop-router-content'
import { prepareWorkshopRequestCallback } from '../src/config/workshop-request-callbacks'

vi.mock(
import('../src/config/workshop-example-file'),
async (importOriginal) => ({
...(await importOriginal()),
loadWorkshopExampleFile: vi.fn()
})
)
vi.mock(import('../src/config/workshop-example-file-loader'), () => ({
loadWorkshopExampleFile: vi.fn()
}))

it.for([{}, { image_url: 'https://example.com/still.png' }])(
'rejects an edit without source video even when an image is present',
Expand Down
15 changes: 5 additions & 10 deletions apps/website/scripts/router-render.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from 'vitest'

import { loadWorkshopExampleFile } from '../src/config/workshop-example-file'
import { loadWorkshopExampleFile } from '../src/config/workshop-example-file-loader'
import { runWorkshopRouter } from '../src/config/workshop-router'
import { WorkshopRouterError } from '../src/config/workshop-router-errors'
import {
Expand All @@ -9,18 +9,13 @@ import {
router_render
} from './router-render'

vi.mock(import('../src/config/workshop-router'), async (importOriginal) => ({
...(await importOriginal()),
vi.mock(import('../src/config/workshop-router'), () => ({
runWorkshopRouter: vi.fn()
}))

vi.mock(
import('../src/config/workshop-example-file'),
async (importOriginal) => ({
...(await importOriginal()),
loadWorkshopExampleFile: vi.fn()
})
)
vi.mock(import('../src/config/workshop-example-file-loader'), () => ({
loadWorkshopExampleFile: vi.fn()
}))

describe('router_render', () => {
it.for([
Expand Down
51 changes: 28 additions & 23 deletions apps/website/src/components/auth/AuthEmailForm.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,30 @@
import userEvent from '@testing-library/user-event'
import { render, screen, waitFor } from '@testing-library/vue'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { defineComponent } from 'vue'

import type {
TurnstileApi,
TurnstileRenderOptions
} from '@comfyorg/account/turnstileScript'

import AuthEmailForm from './AuthEmailForm.vue'

const widgetBehavior = vi.hoisted(() => ({
mode: 'silent' as 'silent' | 'unavailable' | 'token',
reset: vi.fn()
}))
vi.mock<unknown>(import('@comfyorg/account/vue'), async (importOriginal) => {
const { h, onMounted } = await import('vue')
return {
...(await (importOriginal as () => Promise<object>)()),
TurnstileWidget: defineComponent({
name: 'TurnstileWidgetStub',
emits: ['update:token', 'update:unavailable'],
setup(_, { emit, expose }) {
expose({ reset: widgetBehavior.reset })
onMounted(() => {
if (widgetBehavior.mode === 'unavailable') {
emit('update:unavailable', true)
}
if (widgetBehavior.mode === 'token') {
emit('update:token', 'cf-token')
}
})
return () => h('div', { 'data-testid': 'turnstile-stub' })
}
})
}
})
const turnstileApi = vi.hoisted(
() =>
({
render: vi.fn(),
reset: widgetBehavior.reset,
remove: vi.fn()
}) satisfies TurnstileApi
)

vi.mock(import('@comfyorg/account/turnstileScript'), () => ({
loadTurnstile: () => Promise.resolve(turnstileApi)
}))

vi.mock<unknown>(import('../../scripts/posthog'), async () => {
const { ref } = await import('vue')
Expand All @@ -44,6 +38,17 @@ const submitButton = (name: RegExp) =>
beforeEach(() => {
widgetBehavior.mode = 'silent'
widgetBehavior.reset.mockReset()
turnstileApi.render.mockImplementation(
(_container: string | HTMLElement, options: TurnstileRenderOptions) => {
if (widgetBehavior.mode === 'unavailable') {
options['error-callback']?.()
}
if (widgetBehavior.mode === 'token') {
options.callback?.('cf-token')
}
return 'widget-id'
}
)
})

describe('AuthEmailForm sign-in', () => {
Expand Down
36 changes: 22 additions & 14 deletions apps/website/src/components/auth/AuthSignIn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vitest'

import { AUTH_ERROR_MESSAGES } from '@comfyorg/account/firebaseAuthError'
import type {
TurnstileApi,
TurnstileRenderOptions
} from '@comfyorg/account/turnstileScript'

import { removeAllToasts, useAuthToasts } from '../../config/auth-toast-state'
import AuthSignIn from './AuthSignIn.vue'
Expand Down Expand Up @@ -47,20 +51,18 @@ vi.mock<unknown>(import('../../scripts/posthog'), async () => {
}
})

vi.mock<unknown>(import('@comfyorg/account/vue'), async (importOriginal) => {
const { defineComponent, h, onMounted } = await import('vue')
return {
...(await (importOriginal as () => Promise<object>)()),
TurnstileWidget: defineComponent({
emits: ['update:token', 'update:unavailable'],
setup(_, { emit, expose }) {
expose({ reset: handles.turnstileReset })
onMounted(() => emit('update:token', 'cf-token'))
return () => h('div', { 'data-testid': 'turnstile' })
}
})
}
})
const turnstileApi = vi.hoisted(
() =>
({
render: vi.fn(),
reset: handles.turnstileReset,
remove: vi.fn()
}) satisfies TurnstileApi
)

vi.mock(import('@comfyorg/account/turnstileScript'), () => ({
loadTurnstile: () => Promise.resolve(turnstileApi)
}))

vi.mock<unknown>(import('@comfyorg/account/webviewDetection'), () => ({
isEmbeddedWebView: () => handles.embedded
Expand Down Expand Up @@ -142,6 +144,12 @@ beforeEach(() => {
handles.emailSignUp.mockReset()
handles.provision.mockReset().mockResolvedValue(undefined)
handles.turnstileReset.mockReset()
turnstileApi.render.mockImplementation(
(_container: string | HTMLElement, options: TurnstileRenderOptions) => {
options.callback?.('cf-token')
return 'widget-id'
}
)
handles.isProvisioningError.mockReset().mockReturnValue(false)
handles.isNewUser.mockReset().mockReturnValue(false)
handles.captureAuthCompleted.mockClear()
Expand Down
43 changes: 17 additions & 26 deletions apps/website/src/components/hero/camera/CameraWidget.test.ts
Original file line number Diff line number Diff line change
@@ -1,39 +1,29 @@
// @vitest-environment happy-dom
import { fromPartial } from '@total-typescript/shoehorn'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { PerspectiveCamera, Vector3 } from 'three'
import type * as ThreeModule from 'three'
import type { Camera, Scene } from 'three'
import type { Camera, Scene, WebGLRenderer as WebGLRendererType } from 'three'
import { WebGLRenderer } from 'three/src/renderers/WebGLRenderer.js'

import { CameraWidget } from './CameraWidget'
import type { CameraState } from './types'

// Everything except the GPU-bound renderer runs for real: scene graph,
// raycasting and drag math are the code under test. The fake renderer updates
// world matrices the way WebGLRenderer.render does, so raycasts see current
// object positions.
vi.mock(import('three'), async (importOriginal) => {
const three = await importOriginal<typeof ThreeModule>()
type WebGLRendererContract = Pick<
ThreeModule.WebGLRenderer,
'domElement' | 'outputColorSpace' | 'setSize' | 'setPixelRatio' | 'dispose'
>
class FakeWebGLRenderer implements WebGLRendererContract {
domElement = document.createElement('canvas')
outputColorSpace: ThreeModule.ColorSpace = ''
setSize() {}
setPixelRatio() {}
dispose() {}
vi.mock(import('three/src/renderers/WebGLRenderer.js'), () => ({
WebGLRenderer: vi.fn()
}))

function fakeRenderer() {
return fromPartial<WebGLRendererType>({
domElement: document.createElement('canvas'),
setSize: vi.fn(),
setPixelRatio: vi.fn(),
dispose: vi.fn(),
render(scene: Scene, camera: Camera) {
scene.updateMatrixWorld(true)
camera.updateMatrixWorld(true)
}
}
return {
...three,
WebGLRenderer:
FakeWebGLRenderer as unknown as typeof ThreeModule.WebGLRenderer
}
})
})
}

const SIZE = 300

Expand Down Expand Up @@ -131,10 +121,11 @@ describe('CameraWidget', () => {
beforeEach(() => {
FakeImage.instances = []
FakeResizeObserver.instances = []
vi.mocked(WebGLRenderer).mockImplementation(fakeRenderer)
vi.stubGlobal('Image', FakeImage)
vi.stubGlobal('ResizeObserver', FakeResizeObserver)
vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(
fake2dContext as unknown as CanvasRenderingContext2D
fromPartial<CanvasRenderingContext2D>(fake2dContext)
)
})

Expand Down
4 changes: 2 additions & 2 deletions apps/website/src/components/hero/camera/CameraWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import {
TorusGeometry,
TubeGeometry,
Vector2,
Vector3,
WebGLRenderer
Vector3
} from 'three'
import type { Camera, Material } from 'three'
import { WebGLRenderer } from 'three/src/renderers/WebGLRenderer.js'

import type { CameraPalette, CameraState, CameraWidgetOptions } from './types'

Expand Down
9 changes: 3 additions & 6 deletions apps/website/src/components/workshop/ModelDetail.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,16 @@ vi.mock(import('../../config/workshop-session-state'), () => ({
})
}))

vi.mock(import('../../scripts/posthog'), async (importOriginal) => ({
...(await importOriginal()),
vi.mock(import('../../scripts/posthog'), () => ({
useWorkshopAuthFlag: () => computed(() => auth.enabled.value),
useWorkshopAuthFlagSettled: () => computed(() => auth.flagSettled.value)
}))

vi.mock(import('../../config/workshop-router'), async (importOriginal) => ({
...(await importOriginal()),
vi.mock(import('../../config/workshop-router'), () => ({
runWorkshopRouter: vi.fn()
}))

vi.mock(import('../../config/workshop-credits'), async (importOriginal) => ({
...(await importOriginal()),
vi.mock(import('../../config/workshop-credits'), () => ({
refreshWorkshopCredits: vi.fn().mockResolvedValue(undefined),
useWorkshopCredits: () => ({
balance: computed(() => credits.balance.value),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import { WORKSHOP_CLOUD_BASE_URL } from '../../config/workshop-env'
import PlaygroundOutput from './PlaygroundOutput.vue'
import { downloadOutput } from '../../config/workshop-output-download'

vi.mock(import('../../config/workshop-output-download'), async (original) => ({
...(await original()),
vi.mock(import('../../config/workshop-output-download'), () => ({
downloadOutput: vi.fn(async () => true)
}))

Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/config/workshop-creator-request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { workshopFileBase64 } from './workshop-file-encoding'
import { WorkshopRouterError } from './workshop-router-errors'
import { renderWorkshopRequestTemplate } from './workshop-request-template'
import { prepareWorkshopRequestCallback } from './workshop-request-callbacks'
import { loadWorkshopExampleFile } from './workshop-example-file'
import { loadWorkshopExampleFile } from './workshop-example-file-loader'
import { MAX_REQUEST_BYTES } from './workshop-limits'

export interface EncodedWorkshopFile {
Expand Down
64 changes: 64 additions & 0 deletions apps/website/src/config/workshop-example-file-loader.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import type { FileValue } from './workshop-playground'

import {
WORKSHOP_EXAMPLE_MIME_TYPES,
workshopExampleFile
} from './workshop-example-file'

const files = new WeakMap<FileValue, File>()
const MAX_BYTES = 7 * 1024 * 1024

export async function loadWorkshopExampleFile(
value: FileValue,
signal: AbortSignal
): Promise<File> {
signal.throwIfAborted()
const cached = files.get(value)
if (cached) return cached
if (!value.sourceUrl || !workshopExampleFile(value.sourceUrl))
throw new Error('Invalid example media URL')
const requestSignal = AbortSignal.any([signal, AbortSignal.timeout(30_000)])
const response = await fetch(value.sourceUrl, {
signal: requestSignal,
credentials: 'omit',
redirect: 'error'
})
if (
!response.ok ||
Number(response.headers.get('Content-Length')) > MAX_BYTES
) {
await response.body?.cancel()
throw new Error('Example media unavailable or too large')
}
const type =
response.headers.get('Content-Type')?.split(';')[0].trim().toLowerCase() ??
''
if (![...WORKSHOP_EXAMPLE_MIME_TYPES.values()].includes(type)) {
await response.body?.cancel()
throw new Error('Invalid example media type')
}
const reader = response.body?.getReader()
if (!reader) throw new Error('Empty example media')
const chunks: Uint8Array<ArrayBuffer>[] = []
let bytes = 0
try {
for (;;) {
requestSignal.throwIfAborted()
const { done, value: chunk } = await reader.read()
if (done) break
bytes += chunk.byteLength
if (bytes > MAX_BYTES) throw new Error('Example media too large')
chunks.push(new Uint8Array(chunk))
}
} catch (error) {
await reader.cancel().catch(() => {})
throw error
} finally {
reader.releaseLock()
}
signal.throwIfAborted()
if (!bytes) throw new Error('Empty example media')
const file = new File(chunks, value.name, { type })
files.set(value, file)
return file
}
6 changes: 2 additions & 4 deletions apps/website/src/config/workshop-example-file.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { describe, expect, it, vi } from 'vitest'

import {
loadWorkshopExampleFile,
workshopExampleFile
} from './workshop-example-file'
import { workshopExampleFile } from './workshop-example-file'
import { loadWorkshopExampleFile } from './workshop-example-file-loader'
import { getRouterWorkshopModelDetail } from './workshop-router-content'
import { defaultValues, schemaForModel } from './workshop-playground'
import { prepareWorkshopRouterInput } from './workshop-request'
Expand Down
Loading
Loading