Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: remove lambda function

Marc Seitzd0143f3ecf16
diff --git a/lib/trigger/bulk-download.ts b/lib/trigger/bulk-download.ts
index 6b43a427..da6be8fe 100644
--- a/lib/trigger/bulk-download.ts
+++ b/lib/trigger/bulk-download.ts
@@ -1,11 +1,8 @@
import { logger, task } from "@trigger.dev/sdk";
-import { getStorageConfig } from "@/ee/features/storage/config";
-import {
- InvocationType,
- InvokeCommand,
- LambdaClient,
-} from "@aws-sdk/client-lambda";
+import { getTeamStorageConfigById } from "@/ee/features/storage/config";
+import { InvocationType, InvokeCommand } from "@aws-sdk/client-lambda";
+import { getLambdaClientForTeam } from "@/lib/files/aws-client";
import { sendDownloadReadyEmail } from "@/lib/emails/send-download-ready-email";
import { parseS3PresignedUrl } from "@/lib/files/bulk-download-presign";
import prisma from "@/lib/prisma";
@@ -69,8 +66,6 @@ export type BulkDownloadPayload = {
};
fileKeys: string[];
sourceBucket: string;
- lambdaFunctionName: string;
- storageRegion: string;
watermarkConfig?: {
enabled: boolean;
config?: any;
@@ -105,8 +100,6 @@ export const bulkDownloadTask = task({
folderStructure,
fileKeys,
sourceBucket,
- lambdaFunctionName,
- storageRegion,
watermarkConfig,
viewId,
viewerEmail,
@@ -155,11 +148,10 @@ export const bulkDownloadTask = task({
});
const result = await processDownloadBatch({
+ teamId,
folderStructure,
fileKeys,
sourceBucket,
- lambdaFunctionName,
- storageRegion,
watermarkConfig,
dataroomName,
zipPartNumber: 1,
@@ -249,11 +241,10 @@ export const bulkDownloadTask = task({
try {
const result = await processDownloadBatch({
+ teamId,
folderStructure: batch.folderStructure,
fileKeys: batch.fileKeys,
sourceBucket,
- lambdaFunctionName,
- storageRegion,
watermarkConfig,
dataroomName,
zipPartNumber: batchNumber,
@@ -354,11 +345,10 @@ export const bulkDownloadTask = task({
});
interface ProcessDownloadBatchParams {
+ teamId: string;
folderStructure: BulkDownloadPayload["folderStructure"];
fileKeys: string[];
sourceBucket: string;
- lambdaFunctionName: string;
- storageRegion: string;
watermarkConfig?: BulkDownloadPayload["watermarkConfig"];
dataroomName: string;
zipPartNumber: number;
@@ -373,11 +363,10 @@ interface ProcessDownloadBatchResult {
}
async function processDownloadBatch({
+ teamId,
folderStructure,
fileKeys,
sourceBucket,
- lambdaFunctionName,
- storageRegion,
watermarkConfig,
dataroomName,
zipPartNumber,
@@ -385,17 +374,13 @@ async function processDownloadBatch({
zipFileName,
expirationHours = 72,
}: ProcessDownloadBatchParams): Promise<ProcessDownloadBatchResult> {
- const storageConfig = getStorageConfig(storageRegion);
- const client = new LambdaClient({
- region: storageConfig.region,
- credentials: {
- accessKeyId: storageConfig.accessKeyId,
- secretAccessKey: storageConfig.secretAccessKey,
- },
- });
+ const [client, storageConfig] = await Promise.all([
+ getLambdaClientForTeam(teamId),
+ getTeamStorageConfigById(teamId),
+ ]);
const command = new InvokeCommand({
- FunctionName: lambdaFunctionName,
+ FunctionName: storageConfig.lambdaFunctionName,
InvocationType: InvocationType.RequestResponse,
Payload: JSON.stringify({
sourceBucket,
diff --git a/pages/api/jobs/process-download-batch.ts b/pages/api/jobs/process-download-batch.ts
index 4161fd0d..0f46fa02 100644
--- a/pages/api/jobs/process-download-batch.ts
+++ b/pages/api/jobs/process-download-batch.ts
@@ -90,17 +90,14 @@ export default async function handler(
// Parse the presigned URL to extract S3 key info for on-demand re-signing
let s3KeyInfo: { bucket: string; key: string; region: string } | undefined;
try {
- const { parseS3PresignedUrl } = await import(
- "@/lib/files/bulk-download-presign"
- );
+ const { parseS3PresignedUrl } =
+ await import("@/lib/files/bulk-download-presign");
s3KeyInfo = parseS3PresignedUrl(body.downloadUrl);
} catch {
// Non-fatal: fall back to stored presigned URL
}
- return res
- .status(200)
- .json({ downloadUrl: body.downloadUrl, s3KeyInfo });
+ return res.status(200).json({ downloadUrl: body.downloadUrl, s3KeyInfo });
} catch (error) {
console.error("Error processing download batch:", error);
return res.status(500).json({
diff --git a/pages/api/links/download/bulk.ts b/pages/api/links/download/bulk.ts
index e19f8f3c..9869baae 100644
--- a/pages/api/links/download/bulk.ts
+++ b/pages/api/links/download/bulk.ts
@@ -465,8 +465,6 @@ export default async function handle(
folderStructure,
fileKeys,
sourceBucket: storageConfig.bucket,
- lambdaFunctionName: storageConfig.lambdaFunctionName!,
- storageRegion: storageConfig.region,
watermarkConfig: view.link.enableWatermark
? {
enabled: true,
diff --git a/pages/api/links/download/dataroom-folder.ts b/pages/api/links/download/dataroom-folder.ts
index 564b5638..eaea6369 100644
--- a/pages/api/links/download/dataroom-folder.ts
+++ b/pages/api/links/download/dataroom-folder.ts
@@ -29,13 +29,14 @@ export default async function handler(
}
try {
- const { folderId, dataroomId, viewId, linkId, emailNotification } = req.body as {
- folderId: string;
- dataroomId: string;
- viewId: string;
- linkId: string;
- emailNotification?: boolean;
- };
+ const { folderId, dataroomId, viewId, linkId, emailNotification } =
+ req.body as {
+ folderId: string;
+ dataroomId: string;
+ viewId: string;
+ linkId: string;
+ emailNotification?: boolean;
+ };
if (!folderId) {
return res
.status(400)
@@ -148,8 +149,13 @@ export default async function handler(
});
// Collect descendants via parentId chain (source of truth)
- const descendantIds = collectDescendantIds(rootFolder.id, allDataroomFolders);
- const subfolders = allDataroomFolders.filter((f) => descendantIds.has(f.id));
+ const descendantIds = collectDescendantIds(
+ rootFolder.id,
+ allDataroomFolders,
+ );
+ const subfolders = allDataroomFolders.filter((f) =>
+ descendantIds.has(f.id),
+ );
// Keep the full (unfiltered) folder list for path computation below.
// Permission filtering may remove parent folders that only have canView
@@ -236,7 +242,8 @@ export default async function handler(
const computedPathMap = buildFolderPathsFromHierarchy(fullFolders);
// Compute the root folder's path from the hierarchy
- const computedRootPath = computedPathMap.get(rootFolder.id) ?? rootFolder.path;
+ const computedRootPath =
+ computedPathMap.get(rootFolder.id) ?? rootFolder.path;
const folderStructure: {
[key: string]: {
@@ -309,7 +316,10 @@ export default async function handler(
}
};
- const rootFolderInfo = { name: rootFolder.name, computedPath: computedRootPath };
+ const rootFolderInfo = {
+ name: rootFolder.name,
+ computedPath: computedRootPath,
+ };
// Pre-index documents by folderId for O(1) lookup per folder
const docsByFolderId = new Map<string, typeof allDocuments>();
@@ -423,7 +433,9 @@ export default async function handler(
documentCount: allDocuments.length,
isFolderDownload: true,
},
- }).catch((err) => console.error("Error sending Slack notification:", err));
+ }).catch((err) =>
+ console.error("Error sending Slack notification:", err),
+ );
}
const teamId = view.link.teamId!;
@@ -451,7 +463,7 @@ export default async function handler(
viewerId: view.viewerId ?? undefined,
viewerEmail: view.viewerEmail ?? undefined,
emailNotification: sendEmail,
- emailAddress: sendEmail ? view.viewerEmail ?? undefined : undefined,
+ emailAddress: sendEmail ? (view.viewerEmail ?? undefined) : undefined,
});
const handle = await bulkDownloadTask.trigger(
@@ -463,8 +475,6 @@ export default async function handler(
folderStructure,
fileKeys,
sourceBucket: storageConfig.bucket,
- lambdaFunctionName: storageConfig.lambdaFunctionName!,
- storageRegion: storageConfig.region,
watermarkConfig: view.link.enableWatermark
? {
enabled: true,
@@ -487,12 +497,17 @@ export default async function handler(
viewerEmail: view.viewerEmail ?? undefined,
linkId,
emailNotification: sendEmail,
- emailAddress: sendEmail ? view.viewerEmail ?? undefined : undefined,
+ emailAddress: sendEmail ? (view.viewerEmail ?? undefined) : undefined,
folderName: rootFolder.name,
},
{
idempotencyKey: job.id,
- tags: [`team_${teamId}`, `dataroom_${dataroomId}`, `job_${job.id}`, `link_${linkId}`],
+ tags: [
+ `team_${teamId}`,
+ `dataroom_${dataroomId}`,
+ `job_${job.id}`,
+ `link_${linkId}`,
+ ],
},
);
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/download/bulk.ts b/pages/api/teams/[teamId]/datarooms/[id]/download/bulk.ts
index d0216999..7a64ec5d 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/download/bulk.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/download/bulk.ts
@@ -248,8 +248,6 @@ export default async function handler(
folderStructure: folderStructure,
fileKeys: fileKeys,
sourceBucket: storageConfig.bucket,
- lambdaFunctionName: storageConfig.lambdaFunctionName!,
- storageRegion: storageConfig.region,
watermarkConfig: { enabled: false },
userId: userId,
emailNotification: !!user?.email,