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
4 changes: 2 additions & 2 deletions src/utils/builder-project-sync.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ export type BuilderProjectSyncCollection = ReturnType<

export function getBuilderProjectBrowserSessionId({
storage = getSessionStorage(),
createId = crypto.randomUUID,
createId = () => crypto.randomUUID(),
}: {
storage?: Pick<Storage, 'getItem' | 'setItem'>
createId?: () => string
Expand All @@ -512,7 +512,7 @@ export function getBuilderProjectBrowserSessionId({
async function claimBuilderProjectBrowserSession({
storage = getSessionStorage(),
lockManager = getBrowserSessionLockManager(),
createId = crypto.randomUUID,
createId = () => crypto.randomUUID(),
}: {
storage?: Pick<Storage, 'getItem' | 'setItem'>
lockManager?: BuilderProjectBrowserSessionLockManager
Expand Down
43 changes: 43 additions & 0 deletions tests/builder-project-sync-client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,49 @@ test('Builder project browser sessions remain stable in session storage', () =>
)
})

test('the default browser session generator preserves the Crypto receiver', (context) => {
const original = crypto.randomUUID
context.mock.method(crypto, 'randomUUID', function (this: Crypto) {
if (this !== crypto) throw new TypeError('Illegal invocation')
return original.call(this)
})
const storage = memoryStorage()
const id = getBuilderProjectBrowserSessionId({ storage })
assert.match(id, /^[a-f0-9-]{36}$/)
assert.equal(getBuilderProjectBrowserSessionId({ storage }), id)
})

test('saved project sync starts with the browser-native session generator', async (context) => {
const original = crypto.randomUUID
context.mock.method(crypto, 'randomUUID', function (this: Crypto) {
if (this !== crypto) throw new TypeError('Illegal invocation')
return original.call(this)
})
await withFakeIndexedDb(async () => {
const storage = memoryStorage()
const client = await createBuilderProjectSyncClient({
projectId,
sessionStorage: storage,
browserSessionLockManager: memoryLockManager(),
fetch: async () => jsonSnapshotPage(snapshot),
createEventSource: () => ({
readyState: 1,
addEventListener: () => undefined,
removeEventListener: () => undefined,
close: () => undefined,
}),
})
try {
assert.equal(
client.browserSessionId,
getBuilderProjectBrowserSessionId({ storage }),
)
} finally {
await client.cleanup()
}
})
})

test('durable project revisions enter the outbox before upload', async () => {
await withFakeIndexedDb(async (indexedDb) => {
const nextRevisionId = uuid(50)
Expand Down
Loading