Simplify to just a call

Author: matt-aitken

packages/trigger-sdk/src/v3/wait.ts

@@ -127,47 +127,18 @@ function createToken(
    * @param requestOptions - The request options for the waitpoint.
    * @returns A promise that returns the token and anything you returned from your callback.
    */
-async function createHttpCallback<TCallbackResult>(
-  callback: (url: string) => Promise<TCallbackResult>,
+async function createHttpCallback(
   options?: CreateWaitpointTokenRequestBody,
   requestOptions?: ApiRequestOptions
-): Promise<{
-  /** The token that you can use to wait for the callback */
-  token: CreateWaitpointHttpCallbackResponseBody;
-  /** Whatever you returned from the function */
-  data: TCallbackResult;
-}> {
+): Promise<CreateWaitpointHttpCallbackResponseBody> {
   const apiClient = apiClientManager.clientOrThrow();
 
-  return tracer.startActiveSpan(
-    `wait.createHttpCallback()`,
-    async (span) => {
-      const waitpoint = await apiClient.createWaitpointHttpCallback(options ?? {}, requestOptions);
-
-      span.setAttribute("id", waitpoint.id);
-      span.setAttribute("isCached", waitpoint.isCached);
-      span.setAttribute("url", waitpoint.url);
-
-      const callbackResult = await tracer.startActiveSpan(
-        `callback()`,
-        async () => {
-          return callback(waitpoint.url);
-        },
-        {
-          attributes: {
-            [SemanticInternalAttributes.STYLE_ICON]: "function",
-            id: waitpoint.id,
-            url: waitpoint.url,
-            isCached: waitpoint.isCached,
-          },
-        }
-      );
-
-      return { token: waitpoint, data: callbackResult };
-    },
+  const $requestOptions = mergeRequestOptions(
     {
+      tracer,
+      name: "wait.createHttpCallback()",
+      icon: "wait-http-callback",
       attributes: {
-        [SemanticInternalAttributes.STYLE_ICON]: "wait-http-callback",
         idempotencyKey: options?.idempotencyKey,
         idempotencyKeyTTL: options?.idempotencyKeyTTL,
         timeout: options?.timeout
@@ -177,8 +148,16 @@ async function createHttpCallback<TCallbackResult>(
           : undefined,
         tags: options?.tags,
       },
-    }
+      onResponseBody: (body: CreateWaitpointHttpCallbackResponseBody, span) => {
+        span.setAttribute("id", body.id);
+        span.setAttribute("isCached", body.isCached);
+        span.setAttribute("url", body.url);
+      },
+    },
+    requestOptions
   );
+
+  return apiClient.createWaitpointHttpCallback(options ?? {}, $requestOptions);
 }
 
 /**

references/hello-world/src/trigger/waits.ts

@@ -152,25 +152,21 @@ export const waitHttpCallback = task({
         auth: process.env.REPLICATE_API_KEY,
       });
 
-      const { token, data } = await wait.createHttpCallback(
-        async (url) => {
-          //pass the provided URL to Replicate's webhook
-          return replicate.predictions.create({
-            version: "27b93a2413e7f36cd83da926f3656280b2931564ff050bf9575f1fdf9bcd7478",
-            input: {
-              prompt: "A painting of a cat by Any Warhol",
-            },
-            // pass the provided URL to Replicate's webhook, so they can "callback"
-            webhook: url,
-            webhook_events_filter: ["completed"],
-          });
+      const token = await wait.createHttpCallback({
+        timeout: "10m",
+        tags: ["replicate"],
+      });
+      logger.log("Create result", { token });
+
+      const call = await replicate.predictions.create({
+        version: "27b93a2413e7f36cd83da926f3656280b2931564ff050bf9575f1fdf9bcd7478",
+        input: {
+          prompt: "A painting of a cat by Any Warhol",
         },
-        {
-          timeout: "10m",
-          tags: ["replicate"],
-        }
-      );
-      logger.log("Create result", { token, data });
+        // pass the provided URL to Replicate's webhook, so they can "callback"
+        webhook: token.url,
+        webhook_events_filter: ["completed"],
+      });
 
       const prediction = await wait.forToken<Prediction>(token);