@fabrika/app 0.5.3 → 0.5.5

package/src/jobs/runner.ts

@@ -8,7 +8,7 @@
 import type { IamMembership } from '@fabrika/auth'
 import { type ContractArtifact, JOB_SITE_PREFIX, type JobArtifact, type JobMailer, type PermissionEntry, permits } from '@fabrika/auth-core'
 import type { CapabilityAuthority } from '@fabrika/db/capability'
-import { type DataAccess, type FrameworkTables, type JobLeases, type LeaseFence, LeaseLostError } from '@fabrika/db/framework'
+import { type DataAccess, type FrameworkTables, type JobLeases, type LeaseFence, LeaseLostError, type Session } from '@fabrika/db/framework'
 import { EmailDeliveryError, type EmailSenderCapabilities, mayRetryDelivery } from '@fabrika/email'
 import { NotFoundError } from '../errors'
 import type { FileCollections } from '../files/collections'
@@ -747,29 +747,38 @@ function jobContext(
 			throw new CapabilityRefusedError('undeclared_dimension', `job '${job.name}' named a dimension the contract does not declare`)
 		}
 	}
+	/** A located `Ref`, read in `using` (a job's transaction, which sees what it wrote) or a statement of its own. */
+	const ref = async <const Act extends string, const Dim extends string>(
+		action: Act,
+		dimension: Dim,
+		id: string,
+		using?: Session,
+	): Promise<Ref<Dim, Act>> => {
+		check(action, dimension)
+		if (typeof id !== 'string' || id === '') {
+			throw new CapabilityRefusedError('missing_id', `job '${job.name}' named an object without an id`)
+		}
+		const database = context.database
+		const chain = database === null || !context.ownedDimensions.has(dimension) ? new Map<string, string>() : await database.locate(dimension, id, using)
+		if (chain === null) {
+			throw new NotFoundError('Not found')
+		}
+		return context.mint.ref(frame, dimension, action, principal.id, id, chain)
+	}
 	return Object.freeze({
 		principal,
 		runId: frame.id,
 		attempt,
 		signal,
-		...(job.site === null || context.data === null ? {} : kitJobContext(frame, context.data, context.files, job.name, job.site, principal.id)),
+		...(job.site === null || context.data === null ? {} : kitJobContext(frame, context.data, context.files, job.name, job.site, principal.id, ref)),
 		...(job.links === null || context.membership === null ? {} : { links: jobLinksOf(job, job.links, context.membership, frame, context) }),
 		...(job.mailer === null ? {} : { mail: jobMailOf(job, job.mailer, frame, signal, context) }),
 		within<const Act extends string, const Dim extends string>(action: Act, dimension: Dim): Within<Dim, Act> {
 			check(action, dimension)
 			return context.mint.within(frame, dimension, action, principal.id, 'all')
 		},
-		async ref<const Act extends string, const Dim extends string>(action: Act, dimension: Dim, id: string): Promise<Ref<Dim, Act>> {
-			check(action, dimension)
-			if (typeof id !== 'string' || id === '') {
-				throw new CapabilityRefusedError('missing_id', `job '${job.name}' named an object without an id`)
-			}
-			const database = context.database
-			const chain = database === null || !context.ownedDimensions.has(dimension) ? new Map<string, string>() : await database.locate(dimension, id)
-			if (chain === null) {
-				throw new NotFoundError('Not found')
-			}
-			return context.mint.ref(frame, dimension, action, principal.id, id, chain)
+		ref<const Act extends string, const Dim extends string>(action: Act, dimension: Dim, id: string): Promise<Ref<Dim, Act>> {
+			return ref(action, dimension, id)
 		},
 	})
 }
@@ -833,6 +842,7 @@ function kitJobContext(
 	name: string,
 	site: SiteDeclaration,
 	principal: string,
+	ref: (action: string, dimension: string, id: string, using: Session) => Promise<Ref<string, string>>,
 ): Readonly<Record<string, unknown>> {
 	const reads = jobHandles(frame, data, site, principal, 'job', async () => data.direct(), () => false)
 	const job = `job '${name}'`
@@ -845,6 +855,7 @@ function kitJobContext(
 			check: boundTo(frame, () => false, 'ctx.files'),
 			session: async () => data.direct(),
 			readOnly: 'a job removes files inside ctx.transaction((tx) => …), as tx.files',
+			attaches: false,
 		}),
 		transaction: async <R>(work: (tx: object) => Promise<R>): Promise<R> => {
 			// Outside its attempt there is no lease to fence the transaction with, so it never opens.
@@ -856,8 +867,20 @@ function kitJobContext(
 					const sql = site.sql === null ? undeclaredSql(job, 'job', 'tx.sql') : jobSql(frame, data, site.sql, session, () => !open)
 					const removing = files === null
 						? noFileCollections(job)
-						: files.site({ where: job, frame, check: boundTo(frame, () => !open, 'tx.files'), session: async () => session, readOnly: null })
-					return await work(Object.freeze({ db: siteData(writes), sql, files: removing }))
+						: files.site({
+							where: job,
+							frame,
+							check: boundTo(frame, () => !open, 'tx.files'),
+							session: async () => session,
+							readOnly: null,
+							attaches: true,
+						})
+					// Located in this transaction, so an object it wrote is found before the commit.
+					const located = (action: string, dimension: string, id: string) => {
+						boundTo(frame, () => !open, 'tx.ref')()
+						return ref(action, dimension, id, session)
+					}
+					return await work(Object.freeze({ db: siteData(writes), sql, files: removing, ref: located }))
 				} finally {
 					open = false
 				}

package/src/react/testing.ts

@@ -23,6 +23,9 @@ const BUN_GLOBALS = [
 	'TextEncoder',
 	'TextDecoder',
 	'ReadableStream',
+	// happy-dom replaces these with its own, which Bun's streams refuse to pipe through: a form's upload digests through one.
+	'WritableStream',
+	'TransformStream',
 ] as const
 
 export interface InstalledDom {

package/src/testing/endpoint-access.ts

@@ -774,17 +774,23 @@ export function endpointAccessKit<DB, P>(app: ContractImplementation<AnyContract
 			return { status }
 		},
 		async file(name, operation, caller) {
+			if (operation === 'upload') {
+				// An upload needs owners only: a seeded file would hold the owner's place, and a collection of
+				// `maxPerOwner: 1` could never take the probe's.
+				const collection = collectionOf(name)
+				const worlds = await postgres.seedWorlds(tables, collection.owner)
+				const grants = [{ action: caller === 'reader' ? collection.read : collection.write, scope: { type: worlds.dimension, value: worlds.own.scope } }]
+				const file = sampleFile(name, collection.types)
+				const path = fileRow(name, 'upload').path.replace(':owner', encodeURIComponent(worlds[caller === 'other' ? 'other' : 'own'].key))
+				const fetch = kit.browser(kit.testCaller(grants))
+				return { status: (await fetch(path, { method: 'POST', headers: { 'Content-Type': file.type }, body: file.bytes })).status }
+			}
 			const { collection, worlds, own, other } = await seedFiles(name)
-			const operationAction = { upload: collection.write, download: collection.read, remove: collection.delete }[operation]
+			const operationAction = operation === 'download' ? collection.read : collection.delete
 			const grants = [{ action: caller === 'reader' ? collection.read : operationAction, scope: { type: worlds.dimension, value: worlds.own.scope } }]
 			const world = caller === 'other' ? 'other' : 'own'
 			const fetch = kit.browser(kit.testCaller(grants))
 			const row = fileRow(name, operation)
-			if (operation === 'upload') {
-				const file = sampleFile(name, collection.types)
-				const path = row.path.replace(':owner', encodeURIComponent(worlds[world].key))
-				return { status: (await fetch(path, { method: 'POST', headers: { 'Content-Type': file.type }, body: file.bytes })).status }
-			}
 			const fileId = world === 'own' ? own : other
 			if (operation === 'download') {
 				return { status: (await fetch(row.path.replace(':fileId', encodeURIComponent(fileId)))).status }

package/src/testing/kit.ts

@@ -191,7 +191,20 @@ function builtAssets(root: string): SpaAssets {
 }
 
 function toRequest(origin: string, input: RequestInfo | URL, init: RequestInit | undefined): Request {
-	return input instanceof Request ? new Request(input, init) : new Request(new URL(input, origin), init)
+	if (!(input instanceof Request)) {
+		return new Request(new URL(input, origin), init)
+	}
+	// Never `new Request(request, …)`: Bun would buffer the body the application must meet as a stream.
+	const base = { method: input.method, headers: input.headers, body: input.body, signal: input.signal, redirect: input.redirect }
+	return init === undefined ? input : new Request(input.url, { ...base, ...init })
+}
+
+/**
+ * `request` with `headers`, its body passed on as the stream it is: `new Request(request, { headers })` would have Bun
+ * buffer the body, and the application must meet a body as it streams, as it does behind the proxy.
+ */
+function withHeaders(request: Request, headers: Headers): Request {
+	return new Request(request.url, { method: request.method, headers, body: request.body, signal: request.signal, redirect: request.redirect })
 }
 
 /** Every header only the proxy may assert, deleted before the decision as Caddy and the proxy Worker delete them. */
@@ -559,7 +572,7 @@ export function bootTestKit<C extends AnyContract>(
 		for (const [header, value] of outcome.asserted) {
 			headers.set(header, value)
 		}
-		const answer = await application.fetch(new Request(request, { headers }), exec)
+		const answer = await application.fetch(withHeaders(request, headers), exec)
 		const decorated = new Headers(answer.headers)
 		outcome.decorate(decorated)
 		return new Response(answer.body, { status: answer.status, statusText: answer.statusText, headers: decorated })
@@ -584,7 +597,7 @@ export function bootTestKit<C extends AnyContract>(
 				const cookies = headers.get('Cookie')
 				headers.set('Cookie', cookies === null || cookies === '' ? caller.cookie : `${cookies}; ${caller.cookie}`)
 			}
-			return kitFetch(new Request(request, { headers }))
+			return kitFetch(withHeaders(request, headers))
 		}
 	}