stan/esports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update S3 client type handling and ensure async client retrieval

Browse Source
This commit is contained in:
Stan Runge
2026-03-01 20:25:32 +01:00
parent 803cc8b13c
commit 9d7154775d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/server/storage/r2.ts
View File

@@ -1,14 +1,16 @@
import { env } from '$env/dynamic/private';
import { S3Client } from 'bun';
type S3ClientType = import('bun').S3Client;
function isConfigured(): boolean {
return !!(env.R2_ACCESS_KEY_ID && env.R2_SECRET_ACCESS_KEY && env.R2_ACCOUNT_ID && env.R2_BUCKET && env.R2_PUBLIC_URL);
}
let client: S3Client | null = null;
let client: S3ClientType | null = null;
function getClient(): S3Client {
async function getClient(): Promise<S3ClientType> {
if (!client) {
const { S3Client } = await import(/* @vite-ignore */ 'bun');
client = new S3Client({
accessKeyId: env.R2_ACCESS_KEY_ID,
secretAccessKey: env.R2_SECRET_ACCESS_KEY,
@@ -49,7 +51,7 @@ export async function proxyImage(osuUrl: string): Promise<string | null> {
if (knownKeys.has(key)) return cdnUrl;
try {
const r2 = getClient();
const r2 = await getClient();
const file = r2.file(key);
const exists = await file.exists();