danvics/openreader
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: replace getS3Client with getS3ProxyClient in audiobook functions

Browse source
This commit is contained in:
Richard R 2026-02-19 11:46:23 -07:00
parent cfd5a7679c
commit ffcd120f68
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/server/audiobooks/blobstore.ts
View file

@ -6,7 +6,7 @@ import {
ListObjectsV2Command, ListObjectsV2Command,
PutObjectCommand, PutObjectCommand,
} from '@aws-sdk/client-s3'; } from '@aws-sdk/client-s3';
import { getS3Client, getS3Config } from '@/lib/server/storage/s3'; import { getS3Config, getS3ProxyClient } from '@/lib/server/storage/s3';
const SAFE_NAMESPACE_REGEX = /^[a-zA-Z0-9._-]{1,128}$/; const SAFE_NAMESPACE_REGEX = /^[a-zA-Z0-9._-]{1,128}$/;
const SAFE_BOOK_ID_REGEX = /^[a-zA-Z0-9._-]{1,128}$/; const SAFE_BOOK_ID_REGEX = /^[a-zA-Z0-9._-]{1,128}$/;
@ -122,7 +122,7 @@ export function audiobookKey(bookId: string, userId: string, fileName: string, n
export async function listAudiobookObjects(bookId: string, userId: string, namespace: string | null): Promise<AudiobookBlobObject[]> { export async function listAudiobookObjects(bookId: string, userId: string, namespace: string | null): Promise<AudiobookBlobObject[]> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const prefix = audiobookPrefix(bookId, userId, namespace); const prefix = audiobookPrefix(bookId, userId, namespace);
let continuationToken: string | undefined; let continuationToken: string | undefined;
const objects: AudiobookBlobObject[] = []; const objects: AudiobookBlobObject[] = [];
@ -163,7 +163,7 @@ export async function headAudiobookObject(
namespace: string | null, namespace: string | null,
): Promise<{ contentLength: number; contentType: string | null; eTag: string | null }> { ): Promise<{ contentLength: number; contentType: string | null; eTag: string | null }> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const key = audiobookKey(bookId, userId, fileName, namespace); const key = audiobookKey(bookId, userId, fileName, namespace);
const res = await client.send(new HeadObjectCommand({ Bucket: cfg.bucket, Key: key })); const res = await client.send(new HeadObjectCommand({ Bucket: cfg.bucket, Key: key }));
return { return {
@ -175,7 +175,7 @@ export async function headAudiobookObject(
export async function getAudiobookObjectBuffer(bookId: string, userId: string, fileName: string, namespace: string | null): Promise<Buffer> { export async function getAudiobookObjectBuffer(bookId: string, userId: string, fileName: string, namespace: string | null): Promise<Buffer> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const key = audiobookKey(bookId, userId, fileName, namespace); const key = audiobookKey(bookId, userId, fileName, namespace);
const res = await client.send(new GetObjectCommand({ Bucket: cfg.bucket, Key: key })); const res = await client.send(new GetObjectCommand({ Bucket: cfg.bucket, Key: key }));
return bodyToBuffer(res.Body); return bodyToBuffer(res.Body);
@ -188,7 +188,7 @@ export async function getAudiobookObjectStream(
namespace: string | null, namespace: string | null,
): Promise<AudiobookBlobBody> { ): Promise<AudiobookBlobBody> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const key = audiobookKey(bookId, userId, fileName, namespace); const key = audiobookKey(bookId, userId, fileName, namespace);
const res = await client.send(new GetObjectCommand({ Bucket: cfg.bucket, Key: key })); const res = await client.send(new GetObjectCommand({ Bucket: cfg.bucket, Key: key }));
return res.Body as AudiobookBlobBody; return res.Body as AudiobookBlobBody;
@ -204,7 +204,7 @@ export async function putAudiobookObject(
options?: { ifNoneMatch?: boolean }, options?: { ifNoneMatch?: boolean },
): Promise<void> { ): Promise<void> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const key = audiobookKey(bookId, userId, fileName, namespace); const key = audiobookKey(bookId, userId, fileName, namespace);
await client.send( await client.send(
new PutObjectCommand({ new PutObjectCommand({
@ -220,14 +220,14 @@ export async function putAudiobookObject(
export async function deleteAudiobookObject(bookId: string, userId: string, fileName: string, namespace: string | null): Promise<void> { export async function deleteAudiobookObject(bookId: string, userId: string, fileName: string, namespace: string | null): Promise<void> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const key = audiobookKey(bookId, userId, fileName, namespace); const key = audiobookKey(bookId, userId, fileName, namespace);
await client.send(new DeleteObjectCommand({ Bucket: cfg.bucket, Key: key })); await client.send(new DeleteObjectCommand({ Bucket: cfg.bucket, Key: key }));
} }
export async function deleteAudiobookPrefix(prefix: string): Promise<number> { export async function deleteAudiobookPrefix(prefix: string): Promise<number> {
const cfg = getS3Config(); const cfg = getS3Config();
const client = getS3Client(); const client = getS3ProxyClient();
const cleanedPrefix = prefix.replace(/^\/+/, ''); const cleanedPrefix = prefix.replace(/^\/+/, '');
let deleted = 0; let deleted = 0;
let continuationToken: string | undefined; let continuationToken: string | undefined;