diff --git a/apps/website/e2e/fixtures/openjutsuProxy.ts b/apps/website/e2e/fixtures/openjutsuProxy.ts new file mode 100644 index 00000000000..d0c7c5f9220 --- /dev/null +++ b/apps/website/e2e/fixtures/openjutsuProxy.ts @@ -0,0 +1,75 @@ +import { readFileSync } from 'node:fs' +import { join } from 'node:path' + +import type { Page, Request, Route } from '@playwright/test' +import { expect } from '@playwright/test' + +import { websiteRoot } from '@website/paths' + +type Answer = Parameters[0] + +const QUOTE = { + free_runs_remaining: 0, + resets_at: null, + price_credits: 0, + price_per_second: { + tier_input: 'resolution', + tier_match: 'exact', + credits: { '480': 8, '768': 16 } + }, + next_run: 'paid' +} + +const SWAP_JOB = { + id: 'e2e-openjutsu-swap', + status: 'succeeded', + outputs: [{ id: 'out', filename: 'openjutsu/result_00001_.mp4' }] +} + +export async function mockOpenjutsuProxy(page: Page, workspaceToken: string) { + const calls: string[] = [] + const result = readFileSync( + join(websiteRoot, 'e2e/assets/validation-16s.mp4') + ) + let uploads = 0 + const answers = new Map Answer>( + Object.entries({ + 'GET /quote': () => ({ json: QUOTE }), + 'POST /assets': () => ({ + json: { file_path: `openjutsu-e2e-${++uploads}` } + }), + 'POST /jobs': (request: Request) => { + const sent = request.postData() ?? '' + expect(sent).toContain('H3CharacterSwapPrepareVideo') + expect(sent).toContain('"resolution":768') + expect(sent).toContain('"use_anchor":false') + return { json: SWAP_JOB } + }, + [`GET /jobs/${SWAP_JOB.id}`]: () => ({ json: SWAP_JOB }), + [`GET /jobs/${SWAP_JOB.id}/outputs/out/content`]: () => ({ + contentType: 'video/mp4', + body: result + }) + }) + ) + await page.route(/\/v2\/models\/openai\/gpt-image-2\.5-sunburst/, (route) => + route.fulfill({ status: 503, json: { error_type: 'unavailable' } }) + ) + await page.route(/\/app-proxy\/[^/]+\//, async (route: Route) => { + const request = route.request() + const path = new URL(request.url()).pathname.replace( + /^.*\/app-proxy\/[^/]+/, + '' + ) + const call = `${request.method()} ${path}` + calls.push(call) + expect(request.headers()['authorization']).toBe(`Bearer ${workspaceToken}`) + const answer = answers.get(call) + return route.fulfill( + answer + ? answer(request) + : { status: 404, json: { error_type: 'not_found' } } + ) + }) + return calls +} diff --git a/apps/website/e2e/openjutsu.spec.ts b/apps/website/e2e/openjutsu.spec.ts new file mode 100644 index 00000000000..c7e649da36f --- /dev/null +++ b/apps/website/e2e/openjutsu.spec.ts @@ -0,0 +1,85 @@ +import { join } from 'node:path' + +import type { BrowserContext } from '@playwright/test' +import { expect } from '@playwright/test' + +import { websiteRoot } from '@website/paths' +import { test } from './fixtures/blockExternalMedia' +import { + MODELS_WORKSPACE_TOKEN, + test as signedInTest +} from './fixtures/modelsAccount' +import { mockOpenjutsuProxy } from './fixtures/openjutsuProxy' + +const asset = (name: string) => join(websiteRoot, 'e2e/assets', name) + +async function mockFlags(context: BrowserContext, openjutsu: boolean) { + await context.route('**/t.comfy.org/**', (route) => + /\/(flags|decide)\//.test(route.request().url()) + ? route.fulfill({ + contentType: 'application/json', + json: { + featureFlags: { + 'workshop-enabled': true, + 'workshop-apps-enabled': true, + 'workshop-auth': true, + 'workshop-openjutsu-app-enabled': openjutsu + }, + featureFlagPayloads: {} + } + }) + : route.abort('blockedbyclient') + ) +} + +test('keeps Openjutsu closed while its flag is off', async ({ + page, + context +}) => { + await mockFlags(context, false) + await page.goto('/hub/apps/openjutsu/') + await expect(page.getByText('Openjutsu is not open yet')).toBeVisible() + await expect(page.getByTestId('openjutsu')).toHaveCount(0) +}) + +signedInTest( + 'swaps a character through the app proxy, at the price the page showed', + async ({ page, context, modelsAccount }) => { + await mockFlags(context, true) + await context.route('https://apis.google.com/js/api.js*', (route) => + route.abort('blockedbyclient') + ) + const proxy = await mockOpenjutsuProxy(page, MODELS_WORKSPACE_TOKEN) + await page.goto('/login/') + await page.getByRole('button', { name: 'Use email instead' }).click() + await page.getByLabel('Email').fill(modelsAccount.email) + await page + .getByLabel('Password', { exact: true }) + .fill(modelsAccount.password) + await page.getByRole('button', { name: 'Sign in', exact: true }).click() + await expect(page).toHaveURL('/') + + await page.goto('/hub/apps/openjutsu/') + await page + .getByTestId('openjutsu-video-file') + .setInputFiles(asset('validation-16s.mp4')) + await expect( + page.getByTestId('video-trim-dialog'), + "a visitor's own video opens the trim first" + ).toBeVisible() + await page.getByTestId('video-trim-confirm').click() + await page + .getByTestId('openjutsu-character-file') + .setInputFiles(asset('placeholder-1x1.webp')) + await page.getByLabel('Extra direction').fill('keep the glasses') + + await expect(page.getByTestId('openjutsu-price')).toHaveText('240 credits') + await page.getByTestId('openjutsu-action').click() + + await expect + .poll(() => proxy) + .toContain('GET /jobs/e2e-openjutsu-swap/outputs/out/content') + expect(proxy.filter((call) => call === 'POST /assets')).toHaveLength(2) + expect(proxy.filter((call) => call === 'POST /jobs')).toHaveLength(1) + } +) diff --git a/apps/website/src/components/common/HeaderMain/HeaderMain.vue b/apps/website/src/components/common/HeaderMain/HeaderMain.vue index f2bedd7658d..453a7c1b5e5 100644 --- a/apps/website/src/components/common/HeaderMain/HeaderMain.vue +++ b/apps/website/src/components/common/HeaderMain/HeaderMain.vue @@ -31,6 +31,7 @@ import { import { isWorkshopModelShown } from '@/scripts/workshop-model-flags.ts' import type { HubApp, HubSections } from '@/data/mainNavigation.ts' import GitHubStarBadge from '@/components/common/GitHubStarBadge.vue' +import WorkshopAccount from '@/components/workshop/WorkshopAccount.vue' import HeaderMainDesktop from './HeaderMainDesktop.vue' import HeaderMainMobile from './HeaderMainMobile.vue' import LogoContextMenu from './LogoContextMenu.vue' @@ -68,17 +69,6 @@ const hubSections = computed(() => ({ const showAccount = computed( () => showWorkshop.value && workshopAuthEnabled.value ) -// Each loader waits for the account source, so a visitor the web session -// knows never mounts an island that would start Firebase. -const HeaderAccount = defineAsyncComponent(async () => { - const [source, firebaseHeader] = await Promise.all([ - resolveWorkshopAccountSource(), - import('@/components/workshop/HeaderAccount.vue') - ]) - return source === 'session' - ? import('@/components/workshop/HeaderSessionAccount.vue') - : firebaseHeader -}) const BuyCreditsDialog = defineAsyncComponent(async () => { const [source, dialog] = await Promise.all([ resolveWorkshopAccountSource(), @@ -216,7 +206,7 @@ const ctaButtons = computed(() =>