321507b570
compose.prod.yml passes STORAGE_PUBLIC_URL through ${STORAGE_PUBLIC_URL}
build args/env — when unset in .env.production, docker-compose
substitutes an empty string, not an absent var. ?? only falls back on
null/undefined, so next.config.ts's `new URL("")` threw and failed the
whole `pnpm --filter web build` step. Switched to || in next.config.ts
and lib/storage.ts so empty string also falls back to the default.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
44 lines
1.7 KiB
TypeScript
44 lines
1.7 KiB
TypeScript
import { S3Client, PutObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
|
|
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
|
|
|
|
const bucket = process.env["STORAGE_BUCKET"] || "epicure-uploads";
|
|
const endpoint = process.env["STORAGE_ENDPOINT"] || "http://localhost:9000";
|
|
const publicUrl = process.env["STORAGE_PUBLIC_URL"] || "http://localhost:9000";
|
|
|
|
const credentials = {
|
|
accessKeyId: process.env["STORAGE_ACCESS_KEY"] ?? "minioadmin",
|
|
secretAccessKey: process.env["STORAGE_SECRET_KEY"] ?? "minioadmin",
|
|
};
|
|
|
|
const s3 = new S3Client({
|
|
region: process.env["STORAGE_REGION"] ?? "us-east-1",
|
|
endpoint,
|
|
forcePathStyle: true,
|
|
credentials,
|
|
});
|
|
|
|
// Presigned URLs are PUT/GET directly by the browser, so they must be signed
|
|
// against an endpoint the browser can actually resolve — not the internal
|
|
// docker hostname `s3` (and `endpoint`) use for server-to-server calls. Signing
|
|
// is pure crypto (no network call), so a second client pointed at the public
|
|
// URL is safe even though it's never used to make a real request itself.
|
|
const presignS3 = new S3Client({
|
|
region: process.env["STORAGE_REGION"] ?? "us-east-1",
|
|
endpoint: publicUrl,
|
|
forcePathStyle: true,
|
|
credentials,
|
|
});
|
|
|
|
export async function createPresignedUploadUrl(key: string, contentType: string): Promise<string> {
|
|
const command = new PutObjectCommand({ Bucket: bucket, Key: key, ContentType: contentType });
|
|
return getSignedUrl(presignS3, command, { expiresIn: 300 });
|
|
}
|
|
|
|
export async function deleteObject(key: string): Promise<void> {
|
|
await s3.send(new DeleteObjectCommand({ Bucket: bucket, Key: key }));
|
|
}
|
|
|
|
export function getPublicUrl(key: string): string {
|
|
return `${publicUrl}/${bucket}/${key}`;
|
|
}
|