Skip to content

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

feat: add content disposition to s3 files

Marc Seitzfae60a931afe
diff --git a/lib/files/put-file.ts b/lib/files/put-file.ts
index 0e953dcf..78ea3b4c 100644
--- a/lib/files/put-file.ts
+++ b/lib/files/put-file.ts
@@ -109,15 +109,17 @@ const putFileInS3 = async ({
);
}
- const { url, key } = (await presignedResponse.json()) as {
+ const { url, key, fileName } = (await presignedResponse.json()) as {
url: string;
key: string;
+ fileName: string;
};
const response = await fetch(url, {
method: "PUT",
headers: {
"Content-Type": file.type,
+ "Content-Disposition": `attachment; filename="${fileName}"`,
},
body: file,
});
diff --git a/lib/trigger/convert-files.ts b/lib/trigger/convert-files.ts
index c9697784..b7776940 100644
--- a/lib/trigger/convert-files.ts
+++ b/lib/trigger/convert-files.ts
@@ -69,20 +69,18 @@ export const convertFilesToPdfTask = task({
data: document.versions[0].originalFile,
type: document.versions[0].storageType,
});
- const fileResponse = await fetch(fileUrl);
- const fileBuffer = Buffer.from(await fileResponse.arrayBuffer());
// Prepare form data
const formData = new FormData();
formData.append(
- "files",
- new Blob([fileBuffer], {
- type: document.versions[0].contentType,
- }),
- document.name,
+ "downloadFrom",
+ JSON.stringify([
+ {
+ url: fileUrl,
+ },
+ ]),
);
formData.append("quality", "50");
- console.log("formData", formData);
// Make the conversion request
const conversionResponse = await retry.fetch(
diff --git a/package-lock.json b/package-lock.json
index b49bbca6..a0433176 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,9 +50,9 @@
"@tanstack/react-table": "^8.20.5",
"@teamhanko/passkeys-next-auth-provider": "^0.2.7",
"@tremor/react": "^3.18.4",
- "@trigger.dev/nextjs": "^3.2.0",
- "@trigger.dev/react": "^3.2.0",
- "@trigger.dev/sdk": "^3.2.0",
+ "@trigger.dev/nextjs": "3.2.1",
+ "@trigger.dev/react": "3.2.1",
+ "@trigger.dev/sdk": "3.2.1",
"@tus/s3-store": "^1.6.0",
"@tus/server": "^1.9.0",
"@tus/utils": "^0.4.0",
@@ -124,7 +124,7 @@
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.9",
- "@trigger.dev/build": "^3.2.0",
+ "@trigger.dev/build": "3.2.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/bcryptjs": "^2.4.6",
"@types/js-cookie": "^3.0.6",
@@ -1917,9 +1917,9 @@
}
},
"node_modules/@electric-sql/client": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/@electric-sql/client/-/client-0.6.3.tgz",
- "integrity": "sha512-/AYkRrEASKIGcjtNp8IVJ3sAUm+IQ2l0NrGgDvvAG/n1+ifOl7kD1E4dRyg1qdY/b+HdKhGNYlNgsPuwMKO2Mg==",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/@electric-sql/client/-/client-0.7.1.tgz",
+ "integrity": "sha512-NpKEn5hDSy+NaAdG9Ql8kIGfjrj/XfakJOOHTTutb99db3Dza0uUfnkqycFpyUAarFMQ4hYSKgx8AbOm1PCeFQ==",
"optionalDependencies": {
"@rollup/rollup-darwin-arm64": "^4.18.1"
}
@@ -5338,9 +5338,9 @@
}
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.24.3",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz",
- "integrity": "sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==",
+ "version": "4.27.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.3.tgz",
+ "integrity": "sha512-OuRysZ1Mt7wpWJ+aYKblVbJWtVn3Cy52h8nLuNSzTqSesYw1EuN6wKp5NW/4eSre3mp12gqFRXOKTcN3AI3LqA==",
"cpu": [
"arm64"
],
@@ -6228,12 +6228,12 @@
}
},
"node_modules/@trigger.dev/build": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/build/-/build-3.2.0.tgz",
- "integrity": "sha512-+SS7hEvjMeqYNp3zBx0dluFkDh6CcOnj2NhJpOxOFTKDi7Jcm8EefNDxD29ttCEIPRS8SFupob2MI5tnt7AqrA==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/build/-/build-3.2.1.tgz",
+ "integrity": "sha512-XK/ixe1MbaOQKDKYLxg4pict6kl3H9JFgqzK5UkbalbWH5T7RREZYDE/rctw6z3YSUK+tehQtl79dg7xfUkhfw==",
"dev": true,
"dependencies": {
- "@trigger.dev/core": "3.2.0",
+ "@trigger.dev/core": "3.2.1",
"pkg-types": "^1.1.3",
"tinyglobby": "^0.2.2",
"tsconfck": "3.1.3"
@@ -6243,11 +6243,11 @@
}
},
"node_modules/@trigger.dev/core": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/core/-/core-3.2.0.tgz",
- "integrity": "sha512-V0YpClYeYP1zgEiH6Mhz9IRN+nwhTsXqWt3b6DBsJq9OWT4zFHuOW14lmGD0jq7tdDfqWffjnE119i4NLTXZCg==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/core/-/core-3.2.1.tgz",
+ "integrity": "sha512-7M4QILckaCXVwLmbLiTLWjy+y812ITwbSAF/Xj/WdMBIQwMipVuPvznq9VyQt5dQzvPrOpNOiQxE94hgdCReIg==",
"dependencies": {
- "@electric-sql/client": "0.6.3",
+ "@electric-sql/client": "0.7.1",
"@google-cloud/precise-date": "^4.0.0",
"@jsonhero/path": "^1.0.21",
"@opentelemetry/api": "1.9.0",
@@ -6262,13 +6262,14 @@
"@opentelemetry/sdk-trace-node": "1.25.1",
"@opentelemetry/semantic-conventions": "1.25.1",
"dequal": "^2.0.3",
+ "eventsource-parser": "^3.0.0",
"execa": "^8.0.1",
"humanize-duration": "^3.27.3",
"jose": "^5.4.0",
"nanoid": "^3.3.4",
"socket.io-client": "4.7.5",
"superjson": "^2.2.1",
- "zod": "3.22.3",
+ "zod": "3.23.8",
"zod-error": "1.5.0",
"zod-validation-error": "^1.5.0"
},
@@ -6332,18 +6333,10 @@
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
}
},
- "node_modules/@trigger.dev/core/node_modules/zod": {
- "version": "3.22.3",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
- "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==",
- "funding": {
- "url": "https://github.com/sponsors/colinhacks"
- }
- },
"node_modules/@trigger.dev/nextjs": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/nextjs/-/nextjs-3.2.0.tgz",
- "integrity": "sha512-bsHbG0VDCRjp9vncwMIhc2hGgY5Xz0mO3TAEhNFNUT9WQzGQkzVjex06gZlFJv5S4jQorpPvazZCSeZJrW0cyw==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/nextjs/-/nextjs-3.2.1.tgz",
+ "integrity": "sha512-OVwh0IiDv/ziiN5X4CxCU5QJgLg3wYMZlwLi5ZdvpqALpQX3wuPSGoSJ3qZJ9usKZ7nrc+/6EgyzEPczH59yvw==",
"dependencies": {
"debug": "^4.3.4"
},
@@ -6356,9 +6349,9 @@
}
},
"node_modules/@trigger.dev/react": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/react/-/react-3.2.0.tgz",
- "integrity": "sha512-PbIV2dUEHZANLdovytrjB3DWM/v9INNNBLU/+qAIBu9J/cgqTtcU1WoYjvIo4MJJijsT18IyjBijnQI14xh1XA==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/react/-/react-3.2.1.tgz",
+ "integrity": "sha512-MDtqnGt0WDYQcW5nkundv1TuDuY+lpr6esigz0gqYzS0melIy6tU2c9mSWvQArPWwH3SQI/yWI0BTlPVJLaa5A==",
"dependencies": {
"@tanstack/react-query": "5.0.0-beta.2",
"@trigger.dev/core": "~2.3.0 || ^3.0.0",
@@ -6378,14 +6371,14 @@
}
},
"node_modules/@trigger.dev/sdk": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@trigger.dev/sdk/-/sdk-3.2.0.tgz",
- "integrity": "sha512-gZqR88+vA04VHYruFqdRhttL7g3WKqeQk3EcAx2Q0mubDyoWCcMklBja+q1bLNi2P4/tKK4Z7WK90Y33RVVWcQ==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/@trigger.dev/sdk/-/sdk-3.2.1.tgz",
+ "integrity": "sha512-KOHkp6M0zxWAgeRtN2/LPS64HtRTuP219ADeqkoNPRY9CgQjnXGeXT+5sEbSOU8w5+AkbRq+wTjcA9tqMTQsBQ==",
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/api-logs": "0.52.1",
"@opentelemetry/semantic-conventions": "1.25.1",
- "@trigger.dev/core": "3.2.0",
+ "@trigger.dev/core": "3.2.1",
"chalk": "^5.2.0",
"cronstrue": "^2.21.0",
"debug": "^4.3.4",
@@ -6394,11 +6387,13 @@
"terminal-link": "^3.0.0",
"ulid": "^2.3.0",
"uuid": "^9.0.0",
- "ws": "^8.11.0",
- "zod": "3.22.3"
+ "ws": "^8.11.0"
},
"engines": {
"node": ">=18.20.0"
+ },
+ "peerDependencies": {
+ "zod": "^3.0.0"
}
},
"node_modules/@trigger.dev/sdk/node_modules/@opentelemetry/semantic-conventions": {
@@ -6409,14 +6404,6 @@
"node": ">=14"
}
},
- "node_modules/@trigger.dev/sdk/node_modules/zod": {
- "version": "3.22.3",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
- "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==",
- "funding": {
- "url": "https://github.com/sponsors/colinhacks"
- }
- },
"node_modules/@trivago/prettier-plugin-sort-imports": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.3.0.tgz",
@@ -9552,6 +9539,14 @@
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
"integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
},
+ "node_modules/eventsource-parser": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.0.tgz",
+ "integrity": "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==",
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
"node_modules/evt": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/evt/-/evt-2.5.7.tgz",
diff --git a/package.json b/package.json
index 2e56c28b..998d2fae 100644
--- a/package.json
+++ b/package.json
@@ -61,9 +61,9 @@
"@tanstack/react-table": "^8.20.5",
"@teamhanko/passkeys-next-auth-provider": "^0.2.7",
"@tremor/react": "^3.18.4",
- "@trigger.dev/nextjs": "^3.2.0",
- "@trigger.dev/react": "^3.2.0",
- "@trigger.dev/sdk": "^3.2.0",
+ "@trigger.dev/nextjs": "3.2.1",
+ "@trigger.dev/react": "3.2.1",
+ "@trigger.dev/sdk": "3.2.1",
"@tus/s3-store": "^1.6.0",
"@tus/server": "^1.9.0",
"@tus/utils": "^0.4.0",
@@ -135,7 +135,7 @@
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.9",
- "@trigger.dev/build": "^3.2.0",
+ "@trigger.dev/build": "3.2.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/bcryptjs": "^2.4.6",
"@types/js-cookie": "^3.0.6",
@@ -158,4 +158,4 @@
"react-pdf": "8.0.2"
}
}
-}
+}
\ No newline at end of file
diff --git a/pages/api/file/s3/get-presigned-post-url.ts b/pages/api/file/s3/get-presigned-post-url.ts
index 5313ee4f..33f2bfc0 100644
--- a/pages/api/file/s3/get-presigned-post-url.ts
+++ b/pages/api/file/s3/get-presigned-post-url.ts
@@ -55,19 +55,21 @@ export default async function handler(
// Get the basename and extension for the file
const { name, ext } = path.parse(fileName);
- let key = `${team.id}/${docId}/${slugify(name)}${ext}`;
+ const slugifiedName = slugify(name) + ext;
+ const key = `${team.id}/${docId}/${slugifiedName}`;
const putObjectCommand = new PutObjectCommand({
Bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET,
Key: key,
ContentType: contentType,
+ ContentDisposition: `attachment; filename="${slugifiedName}"`,
});
const url = await getSignedUrl(client, putObjectCommand, {
expiresIn: ONE_HOUR / ONE_SECOND,
});
- return res.status(200).json({ url, key, docId });
+ return res.status(200).json({ url, key, docId, fileName: slugifiedName });
} catch (error) {
return res.status(500).json({ error: "Internal server error" });
}
diff --git a/pages/api/file/tus/[[...file]].ts b/pages/api/file/tus/[[...file]].ts
index 612e1056..e6080516 100644
--- a/pages/api/file/tus/[[...file]].ts
+++ b/pages/api/file/tus/[[...file]].ts
@@ -1,11 +1,13 @@
import type { NextApiRequest, NextApiResponse } from "next";
+import { CopyObjectCommand } from "@aws-sdk/client-s3";
import slugify from "@sindresorhus/slugify";
import { S3Store } from "@tus/s3-store";
import { Server } from "@tus/server";
import { getServerSession } from "next-auth/next";
import path from "node:path";
+import { getS3Client } from "@/lib/files/aws-client";
import { RedisLocker } from "@/lib/files/tus-redis-locker";
import { newId } from "@/lib/id-helper";
import { lockerRedisClient } from "@/lib/redis";
@@ -23,6 +25,8 @@ const locker = new RedisLocker({
redisClient: lockerRedisClient,
});
+const client = getS3Client();
+
const tusServer = new Server({
// `path` needs to match the route declared by the next file router
path: "/api/file/tus",
@@ -70,6 +74,34 @@ const tusServer = new Server({
});
return { status_code: 500, body: "Internal Server Error" };
},
+ async onUploadFinish(req, res, upload) {
+ try {
+ const metadata = upload.metadata || {};
+ const contentType = metadata.contentType || "application/octet-stream";
+ const { name, ext } = path.parse(metadata.fileName!);
+ const contentDisposition = `attachment; filename="${slugify(name)}${ext}"`;
+
+ // The Key (object path) where the file was uploaded
+ const objectKey = upload.id;
+
+ // Copy the object onto itself, replacing the metadata
+ const params = {
+ Bucket: process.env.NEXT_PRIVATE_UPLOAD_BUCKET,
+ CopySource: `${process.env.NEXT_PRIVATE_UPLOAD_BUCKET}/${objectKey}`,
+ Key: objectKey,
+ ContentType: contentType,
+ ContentDisposition: contentDisposition,
+ MetadataDirective: "REPLACE" as const,
+ };
+
+ const copyCommand = new CopyObjectCommand(params);
+ await client.send(copyCommand);
+
+ return res;
+ } catch (error) {
+ throw { status_code: 500, body: "Error updating metadata" };
+ }
+ },
});
export default function handler(req: NextApiRequest, res: NextApiResponse) {