downloads fix
This commit is contained in:
@@ -10,6 +10,7 @@ import { gitActivityRouter } from "./routers/git-activity";
|
||||
import { postHistoryRouter } from "./routers/post-history";
|
||||
import { infillRouter } from "./routers/infill";
|
||||
import { accountRouter } from "./routers/account";
|
||||
import { downloadsRouter } from "./routers/downloads";
|
||||
import { createTRPCRouter, createTRPCContext } from "./utils";
|
||||
import type { H3Event } from "h3";
|
||||
|
||||
@@ -25,7 +26,8 @@ export const appRouter = createTRPCRouter({
|
||||
gitActivity: gitActivityRouter,
|
||||
postHistory: postHistoryRouter,
|
||||
infill: infillRouter,
|
||||
account: accountRouter
|
||||
account: accountRouter,
|
||||
downloads: downloadsRouter
|
||||
});
|
||||
|
||||
export type AppRouter = typeof appRouter;
|
||||
|
||||
62
src/server/api/routers/downloads.test.ts
Normal file
62
src/server/api/routers/downloads.test.ts
Normal file
@@ -0,0 +1,62 @@
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import { appRouter } from "~/server/api/root";
|
||||
import { createTRPCContext } from "~/server/api/utils";
|
||||
|
||||
// Mock the S3 client and getSignedUrl function
|
||||
vi.mock("@aws-sdk/client-s3", () => ({
|
||||
S3Client: class {
|
||||
constructor() {}
|
||||
send() {
|
||||
return Promise.resolve({
|
||||
$metadata: {},
|
||||
Body: "test content"
|
||||
});
|
||||
}
|
||||
},
|
||||
GetObjectCommand: class {
|
||||
constructor(params: any) {
|
||||
this.params = params;
|
||||
}
|
||||
params: any;
|
||||
}
|
||||
}));
|
||||
|
||||
vi.mock("@aws-sdk/s3-request-presigner", () => ({
|
||||
getSignedUrl: vi.fn().mockResolvedValue("https://test-signed-url.com")
|
||||
}));
|
||||
|
||||
// Mock environment variables
|
||||
process.env.AWS_REGION = "us-east-1";
|
||||
process.env._AWS_ACCESS_KEY = "test-access-key";
|
||||
process.env._AWS_SECRET_KEY = "test-secret-key";
|
||||
process.env.VITE_DOWNLOAD_BUCKET_STRING = "test-bucket";
|
||||
|
||||
describe("downloads router", () => {
|
||||
it("should return a signed URL for valid asset names", async () => {
|
||||
const caller = appRouter.createCaller(
|
||||
await createTRPCContext({ nativeEvent: {} } as any)
|
||||
);
|
||||
|
||||
const result = await caller.downloads.getDownloadUrl.query({
|
||||
asset_name: "lineage"
|
||||
});
|
||||
|
||||
expect(result).toHaveProperty("downloadURL");
|
||||
expect(typeof result.downloadURL).toBe("string");
|
||||
});
|
||||
|
||||
it("should throw NOT_FOUND for invalid asset names", async () => {
|
||||
const caller = appRouter.createCaller(
|
||||
await createTRPCContext({ nativeEvent: {} } as any)
|
||||
);
|
||||
|
||||
try {
|
||||
await caller.downloads.getDownloadUrl.query({
|
||||
asset_name: "invalid-asset"
|
||||
});
|
||||
expect.fail("Should have thrown an error");
|
||||
} catch (error) {
|
||||
expect(error).toHaveProperty("code", "NOT_FOUND");
|
||||
}
|
||||
});
|
||||
});
|
||||
56
src/server/api/routers/downloads.ts
Normal file
56
src/server/api/routers/downloads.ts
Normal file
@@ -0,0 +1,56 @@
|
||||
import { createTRPCRouter, publicProcedure } from "../utils";
|
||||
import { z } from "zod";
|
||||
import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
|
||||
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
|
||||
import { env } from "~/env/server";
|
||||
import { TRPCError } from "@trpc/server";
|
||||
|
||||
const assets: Record<string, string> = {
|
||||
gaze: "Gaze.dmg",
|
||||
lineage: "Life and Lineage.apk",
|
||||
cork: "Cork.zip",
|
||||
"shapes-with-abigail": "shapes-with-abigail.apk"
|
||||
};
|
||||
|
||||
export const downloadsRouter = createTRPCRouter({
|
||||
getDownloadUrl: publicProcedure
|
||||
.input(z.object({ asset_name: z.string() }))
|
||||
.query(async ({ input }) => {
|
||||
const bucket = env.VITE_DOWNLOAD_BUCKET_STRING;
|
||||
const params = {
|
||||
Bucket: bucket,
|
||||
Key: assets[input.asset_name]
|
||||
};
|
||||
|
||||
if (!assets[input.asset_name]) {
|
||||
throw new TRPCError({
|
||||
code: "NOT_FOUND",
|
||||
message: "Asset not found"
|
||||
});
|
||||
}
|
||||
|
||||
const credentials = {
|
||||
accessKeyId: env._AWS_ACCESS_KEY,
|
||||
secretAccessKey: env._AWS_SECRET_KEY
|
||||
};
|
||||
|
||||
try {
|
||||
const client = new S3Client({
|
||||
region: env.AWS_REGION,
|
||||
credentials: credentials
|
||||
});
|
||||
|
||||
const command = new GetObjectCommand(params);
|
||||
const signedUrl = await getSignedUrl(client, command, {
|
||||
expiresIn: 120
|
||||
});
|
||||
return { downloadURL: signedUrl };
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
throw new TRPCError({
|
||||
code: "INTERNAL_SERVER_ERROR",
|
||||
message: "Failed to generate download URL"
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
Reference in New Issue
Block a user