Skip to content

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

feat: add v3 trigger

Marc Seitzb88054aa1c7e
diff --git a/lib/trigger/convert-files.ts b/lib/trigger/convert-files.ts
index 198e90e4..1709fe58 100644
--- a/lib/trigger/convert-files.ts
+++ b/lib/trigger/convert-files.ts
@@ -1,4 +1,3 @@
-import { client } from "@/trigger";
import { logger, retry, task } from "@trigger.dev/sdk/v3";
import { getFile } from "@/lib/files/get-file";
@@ -7,6 +6,7 @@ import prisma from "@/lib/prisma";
import { updateStatus } from "../utils/generate-trigger-status";
import { getExtensionFromContentType } from "../utils/get-content-type";
+import { convertPdfToImage } from "./pdf-to-image";
export type ConvertPayload = {
documentId: string;
@@ -172,16 +172,35 @@ export const convertFilesToPdfTask = task({
updateStatus({ progress: 40, text: "Initiating document processing..." });
- // v2: trigger document uploaded event to trigger convert-pdf-to-image job
- await client.sendEvent({
- id: payload.documentVersionId, // unique eventId for the run
- name: "document.uploaded",
- payload: {
+ // // v2: trigger document uploaded event to trigger convert-pdf-to-image job
+ // await client.sendEvent({
+ // id: payload.documentVersionId, // unique eventId for the run
+ // name: "document.uploaded",
+ // payload: {
+ // documentVersionId: payload.documentVersionId,
+ // teamId: payload.teamId,
+ // documentId: payload.documentId,
+ // },
+ // });
+
+ // trigger convert-pdf-to-image job
+ await convertPdfToImage.trigger(
+ {
+ documentId: payload.documentId,
documentVersionId: payload.documentVersionId,
teamId: payload.teamId,
- documentId: payload.documentId,
+ docId: docId!,
+ versionNumber: 1,
},
- });
+ {
+ idempotencyKey: `${payload.teamId}-${payload.documentVersionId}`,
+ tags: [
+ `team_${payload.teamId}`,
+ `document_${payload.documentId}`,
+ `version:${payload.documentVersionId}`,
+ ],
+ },
+ );
logger.info("Document converted", {
documentId: payload.documentId,
@@ -354,15 +373,34 @@ export const convertCadToPdfTask = task({
});
// v2: trigger document uploaded event to trigger convert-pdf-to-image job
- await client.sendEvent({
- id: payload.documentVersionId, // unique eventId for the run
- name: "document.uploaded",
- payload: {
+ // await client.sendEvent({
+ // id: payload.documentVersionId, // unique eventId for the run
+ // name: "document.uploaded",
+ // payload: {
+ // documentVersionId: payload.documentVersionId,
+ // teamId: payload.teamId,
+ // documentId: payload.documentId,
+ // },
+ // });
+
+ // trigger convert-pdf-to-image job
+ await convertPdfToImage.trigger(
+ {
+ documentId: payload.documentId,
documentVersionId: payload.documentVersionId,
teamId: payload.teamId,
- documentId: payload.documentId,
+ docId: docId!,
+ versionNumber: 1,
},
- });
+ {
+ idempotencyKey: `${payload.teamId}-${payload.documentVersionId}`,
+ tags: [
+ `team_${payload.teamId}`,
+ `document_${payload.documentId}`,
+ `version:${payload.documentVersionId}`,
+ ],
+ },
+ );
logger.info("Document converted", {
documentId: payload.documentId,
diff --git a/pages/api/teams/[teamId]/documents/[id]/versions/index.ts b/pages/api/teams/[teamId]/documents/[id]/versions/index.ts
index dbe44836..682c5938 100644
--- a/pages/api/teams/[teamId]/documents/[id]/versions/index.ts
+++ b/pages/api/teams/[teamId]/documents/[id]/versions/index.ts
@@ -111,7 +111,7 @@ export default async function handle(
documentId,
},
{
- idempotencyKey: `${teamId}-${version.id}`,
+ idempotencyKey: `${teamId}-${version.id}-docs`,
tags: [
`team_${teamId}`,
`document_${documentId}`,
@@ -122,39 +122,39 @@ export default async function handle(
}
// trigger document uploaded event to trigger convert-pdf-to-image job
if (type === "pdf") {
- if (
- teamId === "cluqtfmcr0001zkza4xcgqatw" ||
- teamId === "clup33by90000oewh4rfvp2eg" // local
- ) {
- await convertPdfToImage.trigger(
- {
- documentId: documentId,
- documentVersionId: version.id,
- teamId,
- docId: version.file.split("/")[1], // Extract doc_xxxx from teamId/doc_xxxx/filename
- versionNumber: version.versionNumber,
- },
- {
- idempotencyKey: `${teamId}-${version.id}`,
- tags: [
- `team_${teamId}`,
- `document_${documentId}`,
- `version:${version.id}`,
- ],
- },
- );
- } else {
- await client.sendEvent({
- id: version.id,
- name: "document.uploaded",
- payload: {
- documentVersionId: version.id,
- versionNumber: version.versionNumber,
- documentId: documentId,
- teamId: teamId,
- },
- });
- }
+ // if (
+ // teamId === "cluqtfmcr0001zkza4xcgqatw" ||
+ // teamId === "clup33by90000oewh4rfvp2eg" // local
+ // ) {
+ await convertPdfToImage.trigger(
+ {
+ documentId: documentId,
+ documentVersionId: version.id,
+ teamId,
+ docId: version.file.split("/")[1], // Extract doc_xxxx from teamId/doc_xxxx/filename
+ versionNumber: version.versionNumber,
+ },
+ {
+ idempotencyKey: `${teamId}-${version.id}`,
+ tags: [
+ `team_${teamId}`,
+ `document_${documentId}`,
+ `version:${version.id}`,
+ ],
+ },
+ );
+ // } else {
+ // await client.sendEvent({
+ // id: version.id,
+ // name: "document.uploaded",
+ // payload: {
+ // documentVersionId: version.id,
+ // versionNumber: version.versionNumber,
+ // documentId: documentId,
+ // teamId: teamId,
+ // },
+ // });
+ // }
}
if (type === "sheet" && document?.advancedExcelEnabled) {
diff --git a/pages/api/teams/[teamId]/documents/agreement.ts b/pages/api/teams/[teamId]/documents/agreement.ts
index f9e015fa..497266d6 100644
--- a/pages/api/teams/[teamId]/documents/agreement.ts
+++ b/pages/api/teams/[teamId]/documents/agreement.ts
@@ -10,6 +10,7 @@ import notion from "@/lib/notion";
import prisma from "@/lib/prisma";
import { getTeamWithUsersAndDocument } from "@/lib/team/helper";
import { convertFilesToPdfTask } from "@/lib/trigger/convert-files";
+import { convertPdfToImage } from "@/lib/trigger/pdf-to-image";
import { CustomUser } from "@/lib/types";
import { getExtension, log } from "@/lib/utils";
@@ -126,24 +127,44 @@ export default async function handle(
teamId,
},
{
- idempotencyKey: `${teamId}-${document.versions[0].id}`,
- tags: [`team_${teamId}`, `document_${document.id}`],
+ idempotencyKey: `${teamId}-${document.versions[0].id}-docs`,
+ tags: [
+ `team_${teamId}`,
+ `document_${document.id}`,
+ `version:${document.versions[0].id}`,
+ ],
},
);
}
// skip triggering convert-pdf-to-image job for "notion" / "excel" documents
if (type === "pdf") {
- // trigger document uploaded event to trigger convert-pdf-to-image job
- await client.sendEvent({
- id: document.versions[0].id, // unique eventId for the run
- name: "document.uploaded",
- payload: {
- documentVersionId: document.versions[0].id,
- teamId: teamId,
+ await convertPdfToImage.trigger(
+ {
documentId: document.id,
+ documentVersionId: document.versions[0].id,
+ teamId,
+ docId: fileUrl.split("/")[1],
},
- });
+ {
+ idempotencyKey: `${teamId}-${document.versions[0].id}`,
+ tags: [
+ `team_${teamId}`,
+ `document_${document.id}`,
+ `version:${document.versions[0].id}`,
+ ],
+ },
+ );
+ // // trigger document uploaded event to trigger convert-pdf-to-image job
+ // await client.sendEvent({
+ // id: document.versions[0].id, // unique eventId for the run
+ // name: "document.uploaded",
+ // payload: {
+ // documentVersionId: document.versions[0].id,
+ // teamId: teamId,
+ // documentId: document.id,
+ // },
+ // });
}
return res.status(201).json(document);
diff --git a/pages/api/teams/[teamId]/documents/index.ts b/pages/api/teams/[teamId]/documents/index.ts
index 57a97281..e3a48f2b 100644
--- a/pages/api/teams/[teamId]/documents/index.ts
+++ b/pages/api/teams/[teamId]/documents/index.ts
@@ -276,7 +276,7 @@ export default async function handle(
teamId,
},
{
- idempotencyKey: `${teamId}-${document.versions[0].id}`,
+ idempotencyKey: `${teamId}-${document.versions[0].id}-docs`,
tags: [
`team_${teamId}`,
`document_${document.id}`,
@@ -296,7 +296,7 @@ export default async function handle(
teamId,
},
{
- idempotencyKey: `${teamId}-${document.versions[0].id}`,
+ idempotencyKey: `${teamId}-${document.versions[0].id}-cad`,
tags: [
`team_${teamId}`,
`document_${document.id}`,
@@ -329,37 +329,37 @@ export default async function handle(
// skip triggering convert-pdf-to-image job for "notion" / "excel" documents
if (type === "pdf") {
// trigger document uploaded event to trigger convert-pdf-to-image job
- if (
- teamId === "cluqtfmcr0001zkza4xcgqatw" ||
- teamId === "clup33by90000oewh4rfvp2eg" // local
- ) {
- await convertPdfToImage.trigger(
- {
- documentId: document.id,
- documentVersionId: document.versions[0].id,
- teamId,
- docId: fileUrl.split("/")[1],
- },
- {
- idempotencyKey: `${teamId}-${document.versions[0].id}`,
- tags: [
- `team_${teamId}`,
- `document_${document.id}`,
- `version:${document.versions[0].id}`,
- ],
- },
- );
- } else {
- await client.sendEvent({
- id: document.versions[0].id, // unique eventId for the run
- name: "document.uploaded",
- payload: {
- documentVersionId: document.versions[0].id,
- teamId: teamId,
- documentId: document.id,
- },
- });
- }
+ // if (
+ // teamId === "cluqtfmcr0001zkza4xcgqatw" ||
+ // teamId === "clup33by90000oewh4rfvp2eg" // local
+ // ) {
+ await convertPdfToImage.trigger(
+ {
+ documentId: document.id,
+ documentVersionId: document.versions[0].id,
+ teamId,
+ docId: fileUrl.split("/")[1],
+ },
+ {
+ idempotencyKey: `${teamId}-${document.versions[0].id}`,
+ tags: [
+ `team_${teamId}`,
+ `document_${document.id}`,
+ `version:${document.versions[0].id}`,
+ ],
+ },
+ );
+ // } else {
+ // await client.sendEvent({
+ // id: document.versions[0].id, // unique eventId for the run
+ // name: "document.uploaded",
+ // payload: {
+ // documentVersionId: document.versions[0].id,
+ // teamId: teamId,
+ // documentId: document.id,
+ // },
+ // });
+ // }
}
return res.status(201).json(document);