Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
58f8b47
feat(account-core): web session client and session error codes
dante01yoon Sep 24, 2026
0771e75
test: pin the cloud auth requests with unified_web_session off
dante01yoon Sep 24, 2026
3171270
test(account-core): route table for the fake web session endpoint
dante01yoon Sep 24, 2026
7974b8b
test: pin sign-out and the WebSocket URL with unified_web_session off
dante01yoon Sep 24, 2026
a2b3d13
test: pin customer provisioning and media URLs with unified_web_sessi…
dante01yoon Sep 24, 2026
5976451
feat(account-core): session-backed identity and boot rules
dante01yoon Sep 24, 2026
d66f19d
feat(account-core): requestAuth authorize() for cookie requests
dante01yoon Sep 24, 2026
404220c
fix(account-core): keep a network-lost restore unspent
dante01yoon Sep 24, 2026
f1d353d
feat(account-core): web session lifecycle and heartbeat
dante01yoon Sep 24, 2026
5dfb638
test: assert sign-out closes the previous WebSocket
dante01yoon Sep 24, 2026
59e9361
[chore] Update Ingest API types from cloud@70c573d
mattmillerai Sep 25, 2026
2bd9659
Merge remote-tracking branch 'origin/main' into fe-2892-types
dante01yoon Sep 25, 2026
522d1c3
Merge #18714 (ingest types from cloud@70c573d) for the generated GET …
dante01yoon Sep 25, 2026
5a09df1
refactor(account-core): parse GET /session with the generated schema
dante01yoon Sep 25, 2026
7906683
Merge remote-tracking branch 'origin/dante01yoon/fe-2892-web-session-…
dante01yoon Sep 25, 2026
32f5da1
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
31eca58
fix(account-core): refuse unrecognised 4xx bodies and hold revoke-all…
dante01yoon Sep 25, 2026
4542391
Merge remote-tracking branch 'origin/dante01yoon/fe-2892-web-session-…
dante01yoon Sep 25, 2026
9989b1b
Merge remote-tracking branch 'origin/dante01yoon/fe-2892-web-session-…
dante01yoon Sep 25, 2026
a910388
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
c22e39b
fix(account-core): keep a 200 that fails the session schema transient
dante01yoon Sep 25, 2026
a3138c9
Merge remote-tracking branch 'origin/dante01yoon/fe-2892-web-session-…
dante01yoon Sep 25, 2026
8002741
Merge remote-tracking branch 'origin/dante01yoon/fe-2892-web-session-…
dante01yoon Sep 25, 2026
1c450b4
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
4306c12
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2894-w…
dante01yoon Sep 25, 2026
34142ed
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2895-r…
dante01yoon Sep 25, 2026
7089780
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
2789fe7
fix(account-core): check the restored user and retry a failed remembe…
dante01yoon Sep 25, 2026
d032f28
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
2e14bae
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2895-r…
dante01yoon Sep 25, 2026
dc08d68
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2894-w…
dante01yoon Sep 25, 2026
5021c16
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
e595360
feat(cloud): join the shared web session lifecycle behind unified_web…
dante01yoon Sep 25, 2026
c32b77a
refactor(account-core): pull the transient lookup-error rule out of t…
dante01yoon Sep 25, 2026
1b3aeda
Merge branch 'dante01yoon/fe-2894-web-session-boot' into dante01yoon/…
dante01yoon Sep 25, 2026
5211cf1
Merge remote-tracking branch 'origin/dante01yoon/fe-2895-request-auth…
dante01yoon Sep 25, 2026
e7085c1
feat(cloud): send ingest requests on the web session behind unified_w…
dante01yoon Sep 25, 2026
da544d5
feat(cloud): scope the socket and media URLs to the web session works…
dante01yoon Sep 25, 2026
bbd56b6
fix(cloud): send the workspace on a session media fetch only in the h…
dante01yoon Sep 25, 2026
927ca82
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2895-r…
dante01yoon Sep 25, 2026
dc0cac1
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2897-w…
dante01yoon Sep 25, 2026
8f31e90
fix(account-core): a signed-out tab adopts only a sibling's sign-in
dante01yoon Sep 25, 2026
3a26e60
Merge branch 'dante01yoon/fe-2897-web-session-lifecycle' into dante01…
dante01yoon Sep 25, 2026
bd081ef
fix(cloud): type the web session cross-tab port with the shared message
dante01yoon Sep 25, 2026
afa3165
Merge branch 'dante01yoon/fe-2903-cloud-session-lifecycle' into dante…
dante01yoon Sep 25, 2026
af689d8
Merge branch 'dante01yoon/fe-2895-request-auth' into dante01yoon/fe-2…
dante01yoon Sep 25, 2026
e6d4ba4
Merge branch 'dante01yoon/fe-2904-cloud-api-on-session' into dante01y…
dante01yoon Sep 25, 2026
77f2d97
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2903-c…
dante01yoon Sep 26, 2026
e5b476e
test(account-core): drop duplicated lines in the pack smoke consumer
dante01yoon Sep 26, 2026
7606d9f
Merge branch 'dante01yoon/fe-2903-cloud-session-lifecycle' into dante…
dante01yoon Sep 26, 2026
3fc326b
test(account-core): drop duplicated lines in the pack smoke consumer
dante01yoon Sep 26, 2026
0a189b8
Merge branch 'dante01yoon/fe-2904-cloud-api-on-session' into dante01y…
dante01yoon Sep 26, 2026
5f76d6d
[automated] Apply ESLint and Oxfmt fixes
actions-user Sep 26, 2026
1d2145d
[automated] Apply ESLint and Oxfmt fixes
actions-user Sep 26, 2026
07f9665
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2904-c…
dante01yoon Sep 28, 2026
566d14f
fix(workspace): keep the current workspace when re-entering it on the…
dante01yoon Sep 28, 2026
a7b31b4
test(cloud): a request sent on the web session reports as authenticated
dante01yoon Sep 28, 2026
6fb9dbf
Merge remote-tracking branch 'origin/dante01yoon/fe-2904-cloud-api-on…
dante01yoon Sep 28, 2026
6f7bedb
Merge remote-tracking branch 'origin/main' into dante01yoon/fe-2905-s…
dante01yoon Sep 29, 2026
9b3e71e
test(account-core): list requestAuth once in the inert-import check
dante01yoon Sep 29, 2026
0041723
test(cloud): assert sign-out closes the session socket before the ser…
dante01yoon Sep 29, 2026
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: 0 additions & 1 deletion packages/account-core/src/webSessionInertImport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ it.for([
'@comfyorg/account-core/sessionTokenMint',
'@comfyorg/account-core/webSessionIdentity',
'@comfyorg/account-core/web',
'@comfyorg/account-core/requestAuth',
'@comfyorg/account-core/testing'
])(
'importing %s starts no timer, listener, channel, or request',
Expand Down
31 changes: 26 additions & 5 deletions src/platform/auth/session/cloudWebSessionStore.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { User } from 'firebase/auth'
import { defineStore } from 'pinia'
import { onScopeDispose } from 'vue'
import { onScopeDispose, shallowRef, watch } from 'vue'

import type {
WebSessionAccountChange,
Expand Down Expand Up @@ -67,6 +67,11 @@ function resetForAccountChange(change: WebSessionAccountChange): void {
})
}

function teamWorkspaceId(): string | undefined {
const workspace = useWorkspaceAuthStore().currentWorkspace
return workspace?.type === 'team' ? workspace.id : undefined
}

function sessionOptions(): WebSessionOptions {
return {
apiBaseUrl: api.apiURL(''),
Expand Down Expand Up @@ -107,6 +112,16 @@ export const useCloudWebSessionStore = defineStore('cloudWebSession', () => {
let pendingSignIn: InteractiveSignIn | null = null
let reread: WebSession | null = null
let releaseRequests = () => {}
const signedInUserId = shallowRef<string>()

watch(
() =>
signedInUserId.value &&
JSON.stringify([signedInUserId.value, teamWorkspaceId()]),
(socketScope) => {
if (socketScope) void api.reconnectSocket()
}
)

onScopeDispose(() => {
releaseRequests()
Expand Down Expand Up @@ -142,10 +157,16 @@ export const useCloudWebSessionStore = defineStore('cloudWebSession', () => {
if (!useFeatureFlags().flags.unifiedWebSessionEnabled) return false
const session = createCloudIdentity()
identity = session
session.subscribe(() => {
session.subscribe((state) => {
reread = null
signedInUserId.value =
state.phase === 'signed_in' ? state.session.user.id : undefined
})
releaseRequests = provideWebSessionRequests({
scope: requestScope,
workspaceId: () => (currentSession() ? teamWorkspaceId() : undefined),
send
})
releaseRequests = provideWebSessionRequests({ scope: requestScope, send })
ready = whenSettled(session)
void bootAfter(session, pendingSignIn)
pendingSignIn = null
Expand Down Expand Up @@ -180,11 +201,11 @@ export const useCloudWebSessionStore = defineStore('cloudWebSession', () => {
await ready
const session = currentSession()
if (!identity || !session) return undefined
const workspace = useWorkspaceAuthStore().currentWorkspace
const workspaceId = teamWorkspaceId()
return {
session,
epoch: identity.getEpoch(),
...(workspace?.type === 'team' && { workspaceId: workspace.id })
...(workspaceId && { workspaceId })
}
}

Expand Down
16 changes: 16 additions & 0 deletions src/platform/auth/session/sessionMediaUrl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const MEDIA_ROUTE =
/^(?:\/api)?\/(?:view|viewvideo|vhs\/viewvideo|vhs\/viewaudio|assets\/[^/?#]+\/content)(?:\?|$)/

/**
* Names the workspace on a media route, which an image or video tag loads
* without headers; absent means the personal workspace.
*/
export function scopeMediaRoute(
route: string,
workspaceId: string | undefined
): string {
if (!workspaceId || !MEDIA_ROUTE.test(route)) return route
if (/[?&]workspace_id=/.test(route)) return route
const separator = route.includes('?') ? '&' : '?'
return `${route}${separator}workspace_id=${encodeURIComponent(workspaceId)}`
}
2 changes: 2 additions & 0 deletions src/platform/auth/session/webSessionFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ export async function fetchOnWebSession(
export interface WebSessionRequests {
/** Undefined unless this tab is signed in on the session. */
readonly scope: () => Promise<WebSessionRequestScope | undefined>
/** The signed-in session's team workspace, for URLs that carry no header. */
readonly workspaceId: () => string | undefined
readonly send: (
url: string,
init: RequestInit,
Expand Down
16 changes: 13 additions & 3 deletions src/platform/auth/webSessionFlagOff.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
import { TOKEN_REFRESH_BUFFER_MS } from '@/platform/workspace/workspaceConstants'
import { api } from '@/scripts/api'
import { useAuthStore } from '@/stores/authStore'
import { resultItemPreviewUrl, resultItemUrl } from '@/utils/resultItemUrl'
import {
resultItemPreviewUrl,
resultItemUrl,
resultItemVhsAdvancedPreviewUrl
} from '@/utils/resultItemUrl'
import type { useExtensionService } from '@/services/extensionService'
import type { ComfyApp } from '@/scripts/app'
import type { ComfyExtension } from '@/types/comfy'
Expand Down Expand Up @@ -279,7 +283,10 @@ const MEDIA_ITEM = {

const MEDIA_URLS = [
'/api/view?filename=output.png&type=output&subfolder=',
'/api/view?filename=output.png&type=output&subfolder=&res=512'
'/api/view?filename=output.png&type=output&subfolder=&res=512',
'/api/viewvideo?filename=output.png&type=output&subfolder=',
'/api/vhs/viewaudio?filename=a.wav',
'/api/assets/asset-1/content?disposition=inline'
]

const SIGN_OUT: RecordedRequest[] = [
Expand Down Expand Up @@ -450,7 +457,10 @@ describe('cloud auth requests with unified_web_session off', () => {

expect([
resultItemUrl(MEDIA_ITEM),
resultItemPreviewUrl(MEDIA_ITEM)
resultItemPreviewUrl(MEDIA_ITEM),
resultItemVhsAdvancedPreviewUrl(MEDIA_ITEM),
api.apiURL('/vhs/viewaudio?filename=a.wav'),
api.apiURL('/assets/asset-1/content?disposition=inline')
]).toEqual(MEDIA_URLS)

expect(recorder.socketCloses).toBe(0)
Expand Down
168 changes: 168 additions & 0 deletions src/platform/auth/webSessionFlagOn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ import type { ComfyApp } from '@/scripts/app'
import type { useExtensionService } from '@/services/extensionService'
import { useAuthStore } from '@/stores/authStore'
import type { ComfyExtension } from '@/types/comfy'
import {
resultItemUrl,
resultItemVhsAdvancedPreviewUrl
} from '@/utils/resultItemUrl'

type IdentityObserver = (user: User | null) => void

Expand Down Expand Up @@ -581,3 +585,167 @@ describe('cloud API requests on the shared web session', () => {
}
)
})

class FakeSocket extends EventTarget {
static readonly CONNECTING = 0
static readonly OPEN = 1
static readonly CLOSING = 2
static readonly CLOSED = 3
static created: FakeSocket[] = []
readyState = FakeSocket.CONNECTING
binaryType = 'blob'
readonly path: string
constructor(url: string | URL) {
super()
const parsed = new URL(String(url))
this.path = parsed.pathname + parsed.search
FakeSocket.created.push(this)
}
send() {}
close() {
this.readyState = FakeSocket.CLOSED
}
closeFromServer() {
this.close()
this.dispatchEvent(new Event('close'))
}
}

const MEDIA_ITEM = {
filename: 'output.png',
subfolder: '',
type: 'output',
nodeId: '1',
mediaType: 'images'
} as const

describe('live updates and media on the shared web session', () => {
beforeEach(() => {
identity.reset()
firebaseSignOut.mockReset()
firebaseSignOut.mockImplementation(async () => identity.signOut())
FakeSocket.created = []
vi.stubGlobal('WebSocket', FakeSocket)
window.name = ''
api.socket = null
})

afterEach(() => {
remoteConfig.value = {}
localStorage.clear()
})

async function bootWithSocket() {
const ingest = await bootOnSession()
await api.init()
return ingest
}

it('opens the socket on the cookie and reconnects it into each workspace without minting a token', async () => {
const ingest = await bootWithSocket()
const workspaceAuth = useWorkspaceAuthStore()
expect(FakeSocket.created.map(({ path }) => path)).toEqual(['/ws'])

await workspaceAuth.switchWorkspace('ws-team')
await vi.waitFor(() =>
expect(api.socket).toEqual(
expect.objectContaining({ path: '/ws?workspace_id=ws-team' })
)
)
await workspaceAuth.switchWorkspace('ws-personal')
await vi.waitFor(() =>
expect(api.socket).toEqual(expect.objectContaining({ path: '/ws' }))
)

expect(api.socket).toBe(FakeSocket.created.at(-1))
const replaced = FakeSocket.created.slice(0, -1)
expect(replaced.map(({ readyState }) => readyState)).toEqual(
replaced.map(() => FakeSocket.CLOSED)
)
expect(
FakeSocket.created.filter(({ path }) => path.includes('token'))
).toEqual([])
expect(ingest.requests.map(({ path }) => path)).not.toContain(
'/api/auth/token'
)
})

it.for([
{ workspace: 'ws-team', suffix: '&workspace_id=ws-team' },
{ workspace: 'ws-personal', suffix: '' }
])(
'media URLs name the workspace only for a team ($workspace)',
async ({ workspace, suffix }) => {
await bootOnSession()
await useWorkspaceAuthStore().switchWorkspace(workspace)

expect([
resultItemUrl(MEDIA_ITEM),
resultItemVhsAdvancedPreviewUrl(MEDIA_ITEM),
api.apiURL('/vhs/viewvideo?filename=a.mp4'),
api.apiURL('/api/view?filename=a.png'),
api.apiURL('/assets/asset-1/content?disposition=inline'),
api.apiURL('/queue?view=1')
]).toEqual([
`/api/view?filename=output.png&type=output&subfolder=${suffix}`,
`/api/viewvideo?filename=output.png&type=output&subfolder=${suffix}`,
`/api/vhs/viewvideo?filename=a.mp4${suffix}`,
`/api/view?filename=a.png${suffix}`,
`/api/assets/asset-1/content?disposition=inline${suffix}`,
'/api/queue?view=1'
])
}
)

it('a media fetch names the team workspace in the header only', async () => {
const ingest = await bootOnSession()
await useWorkspaceAuthStore().switchWorkspace('ws-team')
ingest.requests.length = 0

await api.fetchApi('/view?filename=a.png')

const [url] = vi.mocked(fetch).mock.calls.at(-1) ?? []
expect(String(url)).toBe('/api/view?filename=a.png')
expect(ingest.requests).toEqual([
sessionRequest('GET', '/api/view', {
'x-comfy-workspace-id': 'ws-team',
'comfy-user': ''
})
])
})

it('a server close while signed in reconnects on the session', async () => {
await bootWithSocket()
await useWorkspaceAuthStore().switchWorkspace('ws-team')
await vi.waitFor(() =>
expect(api.socket).toEqual(
expect.objectContaining({ path: '/ws?workspace_id=ws-team' })
)
)
const closed = api.socket
assert.instanceOf(closed, FakeSocket)

closed.closeFromServer()
await vi.advanceTimersByTimeAsync(300)

await vi.waitFor(() => expect(api.socket).not.toBe(closed))
expect(api.socket).toEqual(
expect.objectContaining({ path: '/ws?workspace_id=ws-team' })
)
})

it('sign-out closes the socket and opens no other', async () => {
await bootWithSocket()
const sessionSocket = api.socket
assert.instanceOf(sessionSocket, FakeSocket)

await useAuthStore().logout()
expect(sessionSocket.readyState).toBe(FakeSocket.CLOSED)

sessionSocket.closeFromServer()
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
await vi.advanceTimersByTimeAsync(1_000)

expect(FakeSocket.created).toEqual([sessionSocket])
expect(api.socket).toBeNull()
})
})
Loading
Loading