Add URL to the token return types

Author: matt-aitken

apps/webapp/app/components/runs/v3/WaitpointDetails.tsx

@@ -51,12 +51,14 @@ export function WaitpointDetailTable({
           )}
         </Property.Value>
       </Property.Item>
-      <Property.Item>
-        <Property.Label>Callback URL</Property.Label>
-        <Property.Value className="my-1">
-          <ClipboardField value={waitpoint.callbackUrl} variant={"secondary/small"} />
-        </Property.Value>
-      </Property.Item>
+      {waitpoint.type === "MANUAL" && (
+        <Property.Item>
+          <Property.Label>Callback URL</Property.Label>
+          <Property.Value className="my-1">
+            <ClipboardField value={waitpoint.url} variant={"secondary/small"} />
+          </Property.Value>
+        </Property.Item>
+      )}
       <Property.Item>
         <Property.Label>Idempotency key</Property.Label>
         <Property.Value>

apps/webapp/app/presenters/v3/ApiWaitpointPresenter.server.ts

@@ -2,8 +2,8 @@ import { logger, type RuntimeEnvironmentType } from "@trigger.dev/core/v3";
 import { type RunEngineVersion } from "@trigger.dev/database";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { BasePresenter } from "./basePresenter.server";
-import { WaitpointPresenter } from "./WaitpointPresenter.server";
 import { waitpointStatusToApiStatus } from "./WaitpointListPresenter.server";
+import { generateHttpCallbackUrl } from "~/services/httpCallback.server";
 
 export class ApiWaitpointPresenter extends BasePresenter {
   public async call(
@@ -14,6 +14,7 @@ export class ApiWaitpointPresenter extends BasePresenter {
         id: string;
         engine: RunEngineVersion;
       };
+      apiKey: string;
     },
     waitpointId: string
   ) {
@@ -24,6 +25,7 @@ export class ApiWaitpointPresenter extends BasePresenter {
           environmentId: environment.id,
         },
         select: {
+          id: true,
           friendlyId: true,
           type: true,
           status: true,
@@ -62,6 +64,7 @@ export class ApiWaitpointPresenter extends BasePresenter {
       return {
         id: waitpoint.friendlyId,
         type: waitpoint.type,
+        url: generateHttpCallbackUrl(waitpoint.id, environment.apiKey),
         status: waitpointStatusToApiStatus(waitpoint.status, waitpoint.outputIsError),
         idempotencyKey: waitpoint.idempotencyKey,
         userProvidedIdempotencyKey: waitpoint.userProvidedIdempotencyKey,

apps/webapp/app/presenters/v3/WaitpointListPresenter.server.ts

@@ -43,7 +43,7 @@ export type WaitpointListOptions = {
 type Result =
   | {
       success: true;
-      tokens: (WaitpointTokenItem & { callbackUrl: string })[];
+      tokens: WaitpointTokenItem[];
       pagination: {
         next: string | undefined;
         previous: string | undefined;
@@ -266,7 +266,7 @@ export class WaitpointListPresenter extends BasePresenter {
       success: true,
       tokens: tokensToReturn.map((token) => ({
         id: token.friendlyId,
-        callbackUrl: generateHttpCallbackUrl(token.id, environment.apiKey),
+        url: generateHttpCallbackUrl(token.id, environment.apiKey),
         status: waitpointStatusToApiStatus(token.status, token.outputIsError),
         completedAt: token.completedAt ?? undefined,
         timeoutAt: token.completedAfter ?? undefined,

apps/webapp/app/presenters/v3/WaitpointPresenter.server.ts

@@ -1,11 +1,9 @@
 import { isWaitpointOutputTimeout, prettyPrintPacket } from "@trigger.dev/core/v3";
+import { generateHttpCallbackUrl } from "~/services/httpCallback.server";
 import { logger } from "~/services/logger.server";
 import { BasePresenter } from "./basePresenter.server";
 import { type RunListItem, RunListPresenter } from "./RunListPresenter.server";
 import { waitpointStatusToApiStatus } from "./WaitpointListPresenter.server";
-import { WaitpointId } from "@trigger.dev/core/v3/isomorphic";
-import { env } from "~/env.server";
-import { generateHttpCallbackUrl } from "~/services/httpCallback.server";
 
 export type WaitpointDetail = NonNullable<Awaited<ReturnType<WaitpointPresenter["call"]>>>;
 
@@ -92,7 +90,7 @@ export class WaitpointPresenter extends BasePresenter {
     return {
       id: waitpoint.friendlyId,
       type: waitpoint.type,
-      callbackUrl: generateHttpCallbackUrl(waitpoint.id, waitpoint.environment.apiKey),
+      url: generateHttpCallbackUrl(waitpoint.id, waitpoint.environment.apiKey),
       status: waitpointStatusToApiStatus(waitpoint.status, waitpoint.outputIsError),
       idempotencyKey: waitpoint.idempotencyKey,
       userProvidedIdempotencyKey: waitpoint.userProvidedIdempotencyKey,

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens/route.tsx

@@ -181,10 +181,7 @@ export default function Page() {
                                 <CopyableText value={token.id} className="font-mono" />
                               </TableCell>
                               <TableCell to={path}>
-                                <ClipboardField
-                                  value={token.callbackUrl}
-                                  variant={"secondary/small"}
-                                />
+                                <ClipboardField value={token.url} variant={"secondary/small"} />
                               </TableCell>
                               <TableCell to={path}>
                                 <WaitpointStatusCombo status={token.status} className="text-xs" />

packages/core/src/v3/schemas/api.ts

@@ -971,6 +971,8 @@ export type WaitpointTokenStatus = z.infer<typeof WaitpointTokenStatus>;
 
 export const WaitpointTokenItem = z.object({
   id: z.string(),
+  /** If you make a POST request to this URL, it will complete the waitpoint. */
+  url: z.string(),
   status: WaitpointTokenStatus,
   completedAt: z.coerce.date().optional(),
   completedAfter: z.coerce.date().optional(),