make getDatabase async

backend/src/database/index.ts

@@ -23,6 +23,6 @@ export interface PreparedStatement {
 	raw<T = unknown>(): Promise<T[]>
 }
 
-export function getDatabase(env: Pick<Env, 'DATABASE'>): Database {
+export async function getDatabase(env: Pick<Env, 'DATABASE'>): Promise<Database> {
 	return d1(env)
 }

backend/src/middleware/main.ts

@@ -97,7 +97,7 @@ export async function main(context: EventContext<Env, any, any>) {
 		// configuration, which are used to verify the JWT.
 		// TODO: since we don't load the instance configuration anymore, we
 		// don't need to load the user before anymore.
-		if (!(await loadContextData(getDatabase(context.env), clientId, payload.email, context))) {
+		if (!(await loadContextData(await getDatabase(context.env), clientId, payload.email, context))) {
 			return errors.notAuthorized('failed to load context data')
 		}
 

consumer/src/deliver.ts

@@ -8,12 +8,12 @@ import { deliverToActor } from 'wildebeest/backend/src/activitypub/deliver'
 
 export async function handleDeliverMessage(env: Env, actor: Actor, message: DeliverMessageBody) {
 	const toActorId = new URL(message.toActorId)
-	const targetActor = await actors.getAndCache(toActorId, getDatabase(env))
+	const targetActor = await actors.getAndCache(toActorId, await getDatabase(env))
 	if (targetActor === null) {
 		console.warn(`actor ${toActorId} not found`)
 		return
 	}
 
-	const signingKey = await getSigningKey(message.userKEK, getDatabase(env), actor)
+	const signingKey = await getSigningKey(message.userKEK, await getDatabase(env), actor)
 	await deliverToActor(signingKey, actor, targetActor, message.activity, env.DOMAIN)
 }

consumer/src/inbox.ts

@@ -9,7 +9,7 @@ import type { Env } from './'
 
 export async function handleInboxMessage(env: Env, actor: Actor, message: InboxMessageBody) {
 	const domain = env.DOMAIN
-	const db = getDatabase(env)
+	const db = await getDatabase(env)
 	const adminEmail = env.ADMIN_EMAIL
 	const cache = cacheFromEnv(env)
 	const activity = message.activity

consumer/src/index.ts

@@ -20,7 +20,7 @@ export type Env = {
 export default {
 	async queue(batch: MessageBatch<MessageBody>, env: Env, ctx: ExecutionContext) {
 		const sentry = initSentryQueue(env, ctx)
-		const db = getDatabase(env)
+		const db = await getDatabase(env)
 
 		try {
 			for (const message of batch.messages) {

frontend/src/routes/(admin)/oauth/authorize/index.tsx

@@ -14,7 +14,7 @@ export const clientLoader = loader$<Promise<Client>, { DATABASE: D1Database }>(a
 	const client_id = query.get('client_id') || ''
 	let client: Client | null = null
 	try {
-		client = await getClientById(getDatabase(platform), client_id)
+		client = await getClientById(await getDatabase(platform), client_id)
 	} catch (e: unknown) {
 		const error = e as { stack: string; cause: string }
 		console.warn(error.stack, error.cause)
@@ -49,10 +49,10 @@ export const userLoader = loader$<
 		throw html(500, getErrorHtml("The Access JWT doesn't contain an email"))
 	}
 
-	const person = await getPersonByEmail(getDatabase(platform), payload.email)
+	const person = await getPersonByEmail(await getDatabase(platform), payload.email)
 	if (person === null) {
 		const isFirstLogin = true
-		const res = await buildRedirect(getDatabase(platform), request as Request, isFirstLogin, jwt.value)
+		const res = await buildRedirect(await getDatabase(platform), request as Request, isFirstLogin, jwt.value)
 		if (res.status === 302) {
 			throw redirect(302, res.headers.get('location') || '')
 		} else {

frontend/src/routes/(frontend)/[accountId]/[statusId]/index.tsx

@@ -19,7 +19,7 @@ export const statusLoader = loader$<
 	let statusText = ''
 	try {
 		const statusResponse = await statusAPI.handleRequestGet(
-			getDatabase(platform),
+			await getDatabase(platform),
 			params.statusId,
 			domain,
 			{} as Person
@@ -37,7 +37,7 @@ export const statusLoader = loader$<
 	const statusTextContent = await getTextContent(status.content)
 
 	try {
-		const contextResponse = await contextAPI.handleRequest(domain, getDatabase(platform), params.statusId)
+		const contextResponse = await contextAPI.handleRequest(domain, await getDatabase(platform), params.statusId)
 		const contextText = await contextResponse.text()
 		const context = JSON.parse(contextText ?? null) as StatusContext | null
 		if (!context) {

frontend/src/routes/(frontend)/[accountId]/index.tsx

@@ -22,7 +22,7 @@ export const statusesLoader = loader$<
 
 		const handle = parseHandle(accountId)
 		accountId = handle.localPart
-		const response = await getLocalStatuses(request as Request, getDatabase(platform), handle, 0, false)
+		const response = await getLocalStatuses(request as Request, await getDatabase(platform), handle, 0, false)
 		statuses = await response.json<Array<MastodonStatus>>()
 	} catch {
 		throw html(

frontend/src/routes/(frontend)/[accountId]/layout.tsx

@@ -25,14 +25,14 @@ export const accountPageLoader = loader$<
 		const accountId = url.pathname.split('/')[1]
 
 		try {
-			const statusResponse = await statusAPI.handleRequestGet(getDatabase(platform), params.statusId, domain)
+			const statusResponse = await statusAPI.handleRequestGet(await getDatabase(platform), params.statusId, domain)
 			const statusText = await statusResponse.text()
 			isValidStatus = !!statusText
 		} catch {
 			isValidStatus = false
 		}
 
-		account = await getAccount(domain, accountId, getDatabase(platform))
+		account = await getAccount(domain, accountId, await getDatabase(platform))
 	} catch {
 		throw html(
 			500,

frontend/src/routes/(frontend)/[accountId]/with_replies/index.tsx

@@ -23,7 +23,7 @@ export const statusesLoader = loader$<
 
 		const handle = parseHandle(accountId)
 		accountId = handle.localPart
-		const response = await getLocalStatuses(request as Request, getDatabase(platform), handle, 0, true)
+		const response = await getLocalStatuses(request as Request, await getDatabase(platform), handle, 0, true)
 		statuses = await response.json<Array<MastodonStatus>>()
 	} catch {
 		throw html(

frontend/src/routes/(frontend)/explore/index.tsx

@@ -11,7 +11,7 @@ export const statusesLoader = loader$<Promise<MastodonStatus[]>, { DATABASE: D1D
 	async ({ platform, html }) => {
 		try {
 			// TODO: use the "trending" API endpoint here.
-			const response = await timelines.handleRequest(platform.domain, getDatabase(platform))
+			const response = await timelines.handleRequest(platform.domain, await getDatabase(platform))
 			const results = await response.text()
 			// Manually parse the JSON to ensure that Qwik finds the resulting objects serializable.
 			return JSON.parse(results) as MastodonStatus[]

frontend/src/routes/(frontend)/public/index.tsx

@@ -12,7 +12,7 @@ export const statusesLoader = loader$<Promise<MastodonStatus[]>, { DATABASE: D1D
 	async ({ platform, html }) => {
 		try {
 			// TODO: use the "trending" API endpoint here.
-			const response = await timelines.handleRequest(platform.domain, getDatabase(platform))
+			const response = await timelines.handleRequest(platform.domain, await getDatabase(platform))
 			const results = await response.text()
 			// Manually parse the JSON to ensure that Qwik finds the resulting objects serializable.
 			return JSON.parse(results) as MastodonStatus[]

frontend/src/routes/(frontend)/public/local/index.tsx

@@ -12,7 +12,7 @@ export const statusesLoader = loader$<Promise<MastodonStatus[]>, { DATABASE: D1D
 	async ({ platform, html }) => {
 		try {
 			// TODO: use the "trending" API endpoint here.
-			const response = await timelines.handleRequest(platform.domain, getDatabase(platform), { local: true })
+			const response = await timelines.handleRequest(platform.domain, await getDatabase(platform), { local: true })
 			const results = await response.text()
 			// Manually parse the JSON to ensure that Qwik finds the resulting objects serializable.
 			return JSON.parse(results) as MastodonStatus[]

functions/.well-known/webfinger.ts

@@ -7,7 +7,7 @@ import type { WebFingerResponse } from '../../backend/src/webfinger'
 import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequest: PagesFunction<Env, any> = async ({ request, env }) => {
-	return handleRequest(request, getDatabase(env))
+	return handleRequest(request, await getDatabase(env))
 }
 
 const headers = {

functions/ap/o/[id].ts

@@ -5,7 +5,7 @@ import * as objects from 'wildebeest/backend/src/activitypub/objects'
 
 export const onRequest: PagesFunction<Env, any> = async ({ params, request, env }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 const headers = {

functions/ap/users/[id].ts

@@ -7,7 +7,7 @@ import * as actors from 'wildebeest/backend/src/activitypub/actors'
 
 export const onRequest: PagesFunction<Env, any> = async ({ params, request, env }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 const headers = {

functions/ap/users/[id]/followers.ts

@@ -11,7 +11,7 @@ const headers = {
 
 export const onRequest: PagesFunction<Env, any> = async ({ params, request, env }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 export async function handleRequest(domain: string, db: Database, id: string): Promise<Response> {

functions/ap/users/[id]/followers/page.ts

@@ -8,7 +8,7 @@ import type { Env } from 'wildebeest/backend/src/types/env'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 const headers = {

functions/ap/users/[id]/following.ts

@@ -11,7 +11,7 @@ const headers = {
 
 export const onRequest: PagesFunction<Env, any> = async ({ params, request, env }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 export async function handleRequest(domain: string, db: Database, id: string): Promise<Response> {

functions/ap/users/[id]/following/page.ts

@@ -8,7 +8,7 @@ import type { Env } from 'wildebeest/backend/src/types/env'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 const headers = {

functions/ap/users/[id]/inbox.ts

@@ -41,7 +41,7 @@ export const onRequest: PagesFunction<Env, any> = async ({ params, request, env
 	const domain = new URL(request.url).hostname
 	return handleRequest(
 		domain,
-		getDatabase(env),
+		await getDatabase(env),
 		params.id as string,
 		activity,
 		env.QUEUE,

functions/ap/users/[id]/outbox.ts

@@ -7,7 +7,7 @@ import type { Env } from 'wildebeest/backend/src/types/env'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string, env.userKEK)
+	return handleRequest(domain, await getDatabase(env), params.id as string, env.userKEK)
 }
 
 const headers = {

functions/ap/users/[id]/outbox/page.ts

@@ -12,7 +12,7 @@ import { PUBLIC_GROUP } from 'wildebeest/backend/src/activitypub/activities'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 const headers = {

functions/api/v1/accounts/[id].ts

@@ -13,7 +13,7 @@ const headers = {
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, params.id as string, getDatabase(env))
+	return handleRequest(domain, params.id as string, await getDatabase(env))
 }
 
 export async function handleRequest(domain: string, id: string, db: Database): Promise<Response> {

functions/api/v1/accounts/[id]/follow.ts

@@ -13,7 +13,7 @@ import type { Relationship } from 'wildebeest/backend/src/types/account'
 import { addFollowing } from 'wildebeest/backend/src/mastodon/follow'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params, data }) => {
-	return handleRequest(request, getDatabase(env), params.id as string, data.connectedActor, env.userKEK)
+	return handleRequest(request, await getDatabase(env), params.id as string, data.connectedActor, env.userKEK)
 }
 
 export async function handleRequest(

functions/api/v1/accounts/[id]/followers.ts

@@ -16,7 +16,7 @@ import { getFollowers, loadActors } from 'wildebeest/backend/src/activitypub/act
 import * as localFollow from 'wildebeest/backend/src/mastodon/follow'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ params, request, env }) => {
-	return handleRequest(request, getDatabase(env), params.id as string)
+	return handleRequest(request, await getDatabase(env), params.id as string)
 }
 
 export async function handleRequest(request: Request, db: Database, id: string): Promise<Response> {

functions/api/v1/accounts/[id]/following.ts

@@ -16,7 +16,7 @@ import * as webfinger from 'wildebeest/backend/src/webfinger'
 import { getFollowing, loadActors } from 'wildebeest/backend/src/activitypub/actors/follow'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ params, request, env }) => {
-	return handleRequest(request, getDatabase(env), params.id as string)
+	return handleRequest(request, await getDatabase(env), params.id as string)
 }
 
 export async function handleRequest(request: Request, db: Database, id: string): Promise<Response> {

functions/api/v1/accounts/[id]/statuses.ts

@@ -26,7 +26,7 @@ const headers = {
 }
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
-	return handleRequest(request, getDatabase(env), params.id as string)
+	return handleRequest(request, await getDatabase(env), params.id as string)
 }
 
 export async function handleRequest(request: Request, db: Database, id: string): Promise<Response> {

functions/api/v1/accounts/[id]/unfollow.ts

@@ -12,7 +12,7 @@ import type { Relationship } from 'wildebeest/backend/src/types/account'
 import { removeFollowing } from 'wildebeest/backend/src/mastodon/follow'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params, data }) => {
-	return handleRequest(request, getDatabase(env), params.id as string, data.connectedActor, env.userKEK)
+	return handleRequest(request, await getDatabase(env), params.id as string, data.connectedActor, env.userKEK)
 }
 
 export async function handleRequest(

functions/api/v1/accounts/relationships.ts

@@ -8,7 +8,7 @@ import type { ContextData } from 'wildebeest/backend/src/types/context'
 import { getFollowingAcct, getFollowingRequestedAcct } from 'wildebeest/backend/src/mastodon/follow'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, data }) => {
-	return handleRequest(request, getDatabase(env), data.connectedActor)
+	return handleRequest(request, await getDatabase(env), data.connectedActor)
 }
 
 export async function handleRequest(req: Request, db: Database, connectedActor: Person): Promise<Response> {

functions/api/v1/accounts/update_credentials.ts

@@ -22,7 +22,7 @@ const headers = {
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, data, env }) => {
 	return handleRequest(
-		getDatabase(env),
+		await getDatabase(env),
 		request,
 		data.connectedActor,
 		env.CF_ACCOUNT_ID,

functions/api/v1/accounts/verify_credentials.ts

@@ -12,7 +12,7 @@ export const onRequest: PagesFunction<Env, any, ContextData> = async ({ data, en
 	if (!data.connectedActor) {
 		return errors.notAuthorized('no connected user')
 	}
-	const user = await loadLocalMastodonAccount(getDatabase(env), data.connectedActor)
+	const user = await loadLocalMastodonAccount(await getDatabase(env), data.connectedActor)
 
 	const res: CredentialAccount = {
 		...user,

functions/api/v1/apps.ts

@@ -17,7 +17,7 @@ type AppsPost = {
 }
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env }) => {
-	return handleRequest(getDatabase(env), request, getVAPIDKeys(env))
+	return handleRequest(await getDatabase(env), request, getVAPIDKeys(env))
 }
 
 export async function handleRequest(db: Database, request: Request, vapidKeys: JWK) {

functions/api/v1/instance/peers.ts

@@ -4,7 +4,7 @@ import type { Env } from 'wildebeest/backend/src/types/env'
 import { getPeers } from 'wildebeest/backend/src/activitypub/peers'
 
 export const onRequest: PagesFunction<Env, any> = async ({ env }) => {
-	return handleRequest(getDatabase(env))
+	return handleRequest(await getDatabase(env))
 }
 
 export async function handleRequest(db: Database): Promise<Response> {

functions/api/v1/notifications/[id].ts

@@ -15,7 +15,7 @@ const headers = {
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ data, request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, params.id as string, getDatabase(env), data.connectedActor)
+	return handleRequest(domain, params.id as string, await getDatabase(env), data.connectedActor)
 }
 
 export async function handleRequest(

functions/api/v1/push/subscription.ts

@@ -12,11 +12,11 @@ import { VAPIDPublicKey } from 'wildebeest/backend/src/mastodon/subscription'
 import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequestGet: PagesFunction<Env, any, ContextData> = async ({ request, env, data }) => {
-	return handleGetRequest(getDatabase(env), request, data.connectedActor, data.clientId, getVAPIDKeys(env))
+	return handleGetRequest(await getDatabase(env), request, data.connectedActor, data.clientId, getVAPIDKeys(env))
 }
 
 export const onRequestPost: PagesFunction<Env, any, ContextData> = async ({ request, env, data }) => {
-	return handlePostRequest(getDatabase(env), request, data.connectedActor, data.clientId, getVAPIDKeys(env))
+	return handlePostRequest(await getDatabase(env), request, data.connectedActor, data.clientId, getVAPIDKeys(env))
 }
 
 const headers = {

functions/api/v1/statuses.ts

@@ -39,7 +39,7 @@ type StatusCreate = {
 }
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, data }) => {
-	return handleRequest(request, getDatabase(env), data.connectedActor, env.userKEK, env.QUEUE, cacheFromEnv(env))
+	return handleRequest(request, await getDatabase(env), data.connectedActor, env.userKEK, env.QUEUE, cacheFromEnv(env))
 }
 
 // FIXME: add tests for delivery to followers and mentions to a specific Actor.

functions/api/v1/statuses/[id].ts

@@ -20,13 +20,13 @@ import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequestGet: PagesFunction<Env, any, ContextData> = async ({ params, env, request, data }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequestGet(getDatabase(env), params.id as UUID, domain, data.connectedActor)
+	return handleRequestGet(await getDatabase(env), params.id as UUID, domain, data.connectedActor)
 }
 
 export const onRequestDelete: PagesFunction<Env, any, ContextData> = async ({ params, env, request, data }) => {
 	const domain = new URL(request.url).hostname
 	return handleRequestDelete(
-		getDatabase(env),
+		await getDatabase(env),
 		params.id as UUID,
 		data.connectedActor,
 		domain,

functions/api/v1/statuses/[id]/context.ts

@@ -10,7 +10,7 @@ import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), params.id as string)
+	return handleRequest(domain, await getDatabase(env), params.id as string)
 }
 
 const headers = {

functions/api/v1/statuses/[id]/favourite.ts

@@ -17,7 +17,7 @@ import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ env, data, params, request }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(getDatabase(env), params.id as string, data.connectedActor, env.userKEK, domain)
+	return handleRequest(await getDatabase(env), params.id as string, data.connectedActor, env.userKEK, domain)
 }
 
 export async function handleRequest(

functions/api/v1/statuses/[id]/reblog.ts

@@ -17,7 +17,7 @@ import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ env, data, params, request }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(getDatabase(env), params.id as string, data.connectedActor, env.userKEK, env.QUEUE, domain)
+	return handleRequest(await getDatabase(env), params.id as string, data.connectedActor, env.userKEK, env.QUEUE, domain)
 }
 
 export async function handleRequest(

functions/api/v1/tags/[tag].ts

@@ -14,7 +14,7 @@ const headers = {
 
 export const onRequestGet: PagesFunction<Env, any, ContextData> = async ({ params, env, request }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequestGet(getDatabase(env), domain, params.tag as string)
+	return handleRequestGet(await getDatabase(env), domain, params.tag as string)
 }
 
 export async function handleRequestGet(db: Database, domain: string, value: string): Promise<Response> {

functions/api/v1/timelines/public.ts

@@ -16,7 +16,7 @@ export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request,
 	const only_media = searchParams.get('only_media') === 'true'
 	const offset = Number.parseInt(searchParams.get('offset') ?? '0')
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), { local, remote, only_media, offset })
+	return handleRequest(domain, await getDatabase(env), { local, remote, only_media, offset })
 }
 
 export async function handleRequest(

functions/api/v1/timelines/tag/[tag].ts

@@ -11,7 +11,7 @@ const headers = {
 
 export const onRequest: PagesFunction<Env, any, ContextData> = async ({ request, env, params }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(getDatabase(env), request, domain, params.tag as string)
+	return handleRequest(await getDatabase(env), request, domain, params.tag as string)
 }
 
 export async function handleRequest(db: Database, request: Request, domain: string, tag: string): Promise<Response> {

functions/api/v2/instance.ts

@@ -7,7 +7,7 @@ import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequest: PagesFunction<Env, any> = async ({ env, request }) => {
 	const domain = new URL(request.url).hostname
-	return handleRequest(domain, getDatabase(env), env)
+	return handleRequest(domain, await getDatabase(env), env)
 }
 
 export async function handleRequest(domain: string, db: Database, env: Env) {

functions/api/v2/media.ts

@@ -9,7 +9,7 @@ import { mastodonIdSymbol } from 'wildebeest/backend/src/activitypub/objects'
 import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequestPost: PagesFunction<Env, any, ContextData> = async ({ request, env, data }) => {
-	return handleRequestPost(request, getDatabase(env), data.connectedActor, env.CF_ACCOUNT_ID, env.CF_API_TOKEN)
+	return handleRequestPost(request, await getDatabase(env), data.connectedActor, env.CF_ACCOUNT_ID, env.CF_API_TOKEN)
 }
 
 export async function handleRequestPost(

functions/api/v2/media/[id].ts

@@ -14,7 +14,7 @@ import { updateObjectProperty } from 'wildebeest/backend/src/activitypub/objects
 import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequestPut: PagesFunction<Env, any, ContextData> = async ({ params, env, request }) => {
-	return handleRequestPut(getDatabase(env), params.id as UUID, request)
+	return handleRequestPut(await getDatabase(env), params.id as UUID, request)
 }
 
 type UpdateMedia = {

functions/api/v2/search.ts

@@ -22,7 +22,7 @@ type SearchResult = {
 }
 
 export const onRequest: PagesFunction<Env, any> = async ({ request, env }) => {
-	return handleRequest(getDatabase(env), request)
+	return handleRequest(await getDatabase(env), request)
 }
 
 export async function handleRequest(db: Database, request: Request): Promise<Response> {

functions/api/wb/settings/account/alias.ts

@@ -8,7 +8,7 @@ import * as errors from 'wildebeest/backend/src/errors'
 import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequestPost: PagesFunction<Env, any, ContextData> = async ({ env, request, data }) => {
-	return handleRequestPost(getDatabase(env), request, data.connectedActor)
+	return handleRequestPost(await getDatabase(env), request, data.connectedActor)
 }
 
 type AddAliasRequest = {

functions/first-login.ts

@@ -9,7 +9,7 @@ import * as access from 'wildebeest/backend/src/access'
 import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 
 export const onRequestPost: PagesFunction<Env, any, ContextData> = async ({ request, env }) => {
-	return handlePostRequest(request, getDatabase(env), env.userKEK, env.ACCESS_AUTH_DOMAIN, env.ACCESS_AUD)
+	return handlePostRequest(request, await getDatabase(env), env.userKEK, env.ACCESS_AUTH_DOMAIN, env.ACCESS_AUD)
 }
 
 export async function handlePostRequest(

functions/oauth/authorize.ts

@@ -13,7 +13,7 @@ import { type Database, getDatabase } from 'wildebeest/backend/src/database'
 const extractJWTFromRequest = (request: Request) => request.headers.get('Cf-Access-Jwt-Assertion') || ''
 
 export const onRequestPost: PagesFunction<Env, any, ContextData> = async ({ request, env }) => {
-	return handleRequestPost(request, getDatabase(env), env.userKEK, env.ACCESS_AUTH_DOMAIN, env.ACCESS_AUD)
+	return handleRequestPost(request, await getDatabase(env), env.userKEK, env.ACCESS_AUTH_DOMAIN, env.ACCESS_AUD)
 }
 
 export async function buildRedirect(

functions/oauth/token.ts

@@ -12,7 +12,7 @@ type Body = {
 }
 
 export const onRequest: PagesFunction<Env, any> = async ({ request, env }) => {
-	return handleRequest(getDatabase(env), request)
+	return handleRequest(await getDatabase(env), request)
 }
 
 export async function handleRequest(db: Database, request: Request): Promise<Response> {