asepharyana
57f2740df9
Fixes:
- RowList bug: postgres.js returns array directly, not {rows}. Fix in
buckets.ts, files-ext.ts, multipart.ts (3 files, 8 functions)
- S3 ListBuckets routing: GET / was intercepted by handleHome route
- Presigned URL detection: isS3Request() only checked Authorization header
- FK constraint on bucket delete: cascade-delete files & multipart rows first
- docker-compose.yml: pass S3_ACCESS_KEY / S3_SECRET_KEY to container
- Dockerfile: copy home.html to runner stage for handleHome
Tests:
- test/production-e2e.test.ts: 29 tests (11 Web API + 18 S3 SigV4)
All pass against https://upload.asepharyana.my.id
- Creates and cleans up real buckets/objects on production
76 lines
2.5 KiB
TypeScript
76 lines
2.5 KiB
TypeScript
import { sql } from 'drizzle-orm';
|
|
import { db } from './index';
|
|
|
|
export interface Bucket {
|
|
id: string;
|
|
name: string;
|
|
createdAt: Date;
|
|
updatedAt: Date;
|
|
}
|
|
|
|
type QueryRow = Record<string, unknown>;
|
|
type QueryResult = QueryRow[];
|
|
|
|
export const createBucket = async (name: string): Promise<Bucket> => {
|
|
const result = (await db.execute(
|
|
sql`INSERT INTO buckets (name) VALUES (${name}) RETURNING id, name, created_at, updated_at`,
|
|
)) as unknown as QueryResult;
|
|
const row = result[0]!;
|
|
return {
|
|
id: row.id as string,
|
|
name: row.name as string,
|
|
createdAt: new Date(row.created_at as string),
|
|
updatedAt: new Date(row.updated_at as string),
|
|
};
|
|
};
|
|
|
|
export const findBucketByName = async (name: string): Promise<Bucket | null> => {
|
|
const result = (await db.execute(
|
|
sql`SELECT id, name, created_at, updated_at FROM buckets WHERE name = ${name}`,
|
|
)) as unknown as QueryResult;
|
|
if (result.length === 0) return null;
|
|
const row = result[0]!;
|
|
return {
|
|
id: row.id as string,
|
|
name: row.name as string,
|
|
createdAt: new Date(row.created_at as string),
|
|
updatedAt: new Date(row.updated_at as string),
|
|
};
|
|
};
|
|
|
|
export const listBuckets = async (): Promise<Bucket[]> => {
|
|
const result = (await db.execute(
|
|
sql`SELECT id, name, created_at, updated_at FROM buckets ORDER BY name`,
|
|
)) as unknown as QueryResult;
|
|
return result.map((row) => ({
|
|
id: row.id as string,
|
|
name: row.name as string,
|
|
createdAt: new Date(row.created_at as string),
|
|
updatedAt: new Date(row.updated_at as string),
|
|
}));
|
|
};
|
|
|
|
export const deleteBucket = async (name: string): Promise<boolean> => {
|
|
// Cascade-delete rows that hold FK references to the bucket
|
|
await db.execute(
|
|
sql`DELETE FROM multipart_parts WHERE upload_id IN (SELECT upload_id FROM multipart_uploads WHERE bucket_id IN (SELECT id FROM buckets WHERE name = ${name}))`,
|
|
).catch(() => {});
|
|
await db.execute(
|
|
sql`DELETE FROM multipart_uploads WHERE bucket_id IN (SELECT id FROM buckets WHERE name = ${name})`,
|
|
).catch(() => {});
|
|
await db.execute(
|
|
sql`DELETE FROM files WHERE bucket_id IN (SELECT id FROM buckets WHERE name = ${name})`,
|
|
).catch(() => {});
|
|
const result = (await db.execute(
|
|
sql`DELETE FROM buckets WHERE name = ${name}`,
|
|
)) as unknown as QueryResult;
|
|
return result.length > 0;
|
|
};
|
|
|
|
export const bucketExists = async (name: string): Promise<boolean> => {
|
|
const result = (await db.execute(
|
|
sql`SELECT 1 FROM buckets WHERE name = ${name}`,
|
|
)) as unknown as QueryResult;
|
|
return result.length > 0;
|
|
};
|