fix: use publish in triggerFirstInvocation

upstash · Nov 12, 2024 · 85f0d69 · 85f0d69
1 parent 189c704
commit 85f0d69
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 18 deletions.
diff --git a/examples/cloudflare-workers-hono/ci.test.ts b/examples/cloudflare-workers-hono/ci.test.ts
@@ -1,6 +1,7 @@
 
 import { Client } from "@upstash/qstash"
 import { Redis } from "@upstash/redis"
+import { Client as WorkflowClient } from "@upstash/workflow"
 import { serve } from "@upstash/workflow/nextjs"
 import { describe, test, expect } from "bun:test"
 import { RedisEntry } from "./src/app"
@@ -35,6 +36,13 @@ const tests: TestConfig[] = [
     headers: {},
     expectedResult: `step 1 input: '[object Object]', type: 'object', stringified input: '{"foo":"bar"}'`
   },
+  {
+    testDescription: "should allow json object",
+    route: "ci",
+    payload: {"foo":"bar"},
+    headers: {},
+    expectedResult: `step 1 input: '[object Object]', type: 'object', stringified input: '{"foo":"bar"}'`
+  },
   {
     testDescription: "should allow json with one space",
     route: "ci",
@@ -64,17 +72,16 @@ const testEndpoint = ({
     }
 
     const redis = Redis.fromEnv()
-    const client = new Client({ 
+    const client = new WorkflowClient({ 
       baseUrl: process.env.QSTASH_URL,
       token: process.env.QSTASH_TOKEN!
      })
 
     const secret = "secret-" + Math.floor(Math.random() * 10000).toString()
 
-    await client.publish({
+    await client.trigger({
       url: `${process.env.DEPLOYMENT_URL}/${route}`,
-      body: typeof payload === "object" ? JSON.stringify(payload) : payload,
-      method: "POST",
+      body: payload,
       headers: {
         "secret-header": secret,
         ...headers
@@ -101,8 +108,8 @@ describe("cloudflare workers", () => {
       token: "mock"
     })
 
-    // @ts-expect-error mocking publishJSON
-    qstashClient.publishJSON = async () => {
+    // @ts-expect-error mocking publish
+    qstashClient.publish = async () => {
       return { messageId: "msgId" }
     }
 

diff --git a/examples/nextjs-12/ci.mjs b/examples/nextjs-12/ci.mjs
@@ -9,7 +9,7 @@ const qstashClient = new Client({
   token: "mock",
 })
 
-qstashClient.publishJSON = async () => {
+qstashClient.publish = async () => {
   return { messageId: "msgId" }
 }
 

diff --git a/examples/nextjs-pages/ci.test.ts b/examples/nextjs-pages/ci.test.ts
@@ -1,6 +1,7 @@
 
 import { RedisEntry } from "@/utils/types"
 import { Client } from "@upstash/qstash"
+import { Client as WorkflowClient } from "@upstash/workflow"
 import { Redis } from "@upstash/redis"
 import { serve } from "@upstash/workflow/nextjs"
 import { describe, test, expect } from "bun:test"
@@ -42,6 +43,13 @@ const tests: TestConfig[] = [
     },
     expectedResult: `step 1 input: '[object Object]', type: 'object', stringified input: '{"foo":"bar"}'`
   },
+  {
+    testDescription: "should allow json object",
+    route: "api/ci",
+    payload: {"foo":"bar"},
+    headers: {},
+    expectedResult: `step 1 input: '[object Object]', type: 'object', stringified input: '{"foo":"bar"}'`
+  },
   {
     testDescription: "should allow json with one space",
     route: "api/ci",
@@ -75,17 +83,16 @@ const testEndpoint = ({
     }
 
     const redis = Redis.fromEnv()
-    const client = new Client({ 
+    const client = new WorkflowClient({ 
       baseUrl: process.env.QSTASH_URL,
       token: process.env.QSTASH_TOKEN!
      })
 
     const secret = "secret-" + Math.floor(Math.random() * 10000).toString()
 
-    await client.publish({
+    await client.trigger({
       url: `${process.env.DEPLOYMENT_URL}/${route}`,
-      body: typeof payload === "object" ? JSON.stringify(payload) : payload,
-      method: "POST",
+      body: payload,
       headers: {
         "secret-header": secret,
         ...headers
@@ -111,8 +118,8 @@ describe("nextjs-pages", () => {
       token: "mock"
     })
 
-    // @ts-expect-error mocking publishJSON
-    qstashClient.publishJSON = async () => {
+    // @ts-expect-error mocking publish
+    qstashClient.publish = async () => {
       return { messageId: "msgId" }
     }
 

diff --git a/examples/nextjs/ci.test.ts b/examples/nextjs/ci.test.ts
@@ -8,8 +8,8 @@ const qstashClient = new Client({
   token: "mock"
 })
 
-// @ts-expect-error mocking publishJSON
-qstashClient.publishJSON = async () => {
+// @ts-expect-error mocking publish
+qstashClient.publish = async () => {
   return { messageId: "msgId" }
 }
 

diff --git a/src/test-utils.ts b/src/test-utils.ts
@@ -63,7 +63,14 @@ export const mockQStashServer = async ({
         expect(request.headers.get("authorization")).toBe(`Bearer ${token}`);
         // check body
         if (body) {
-          expect(await request.json()).toEqual(body);
+          const requestBody = await request.text()
+          let parsedBody
+          try {
+            parsedBody = JSON.parse(requestBody)
+          } catch {
+            parsedBody = requestBody
+          }
+          expect(parsedBody).toEqual(body);
         } else {
           expect(await request.text()).toBeFalsy();
         }

diff --git a/src/types.ts b/src/types.ts
@@ -12,6 +12,7 @@ import type { WorkflowLogger } from "./logger";
 export type WorkflowClient = {
   batchJSON: InstanceType<typeof Client>["batchJSON"];
   publishJSON: InstanceType<typeof Client>["publishJSON"];
+  publish: InstanceType<typeof Client>["publish"];
   http: InstanceType<typeof Client>["http"];
 };
 /**

diff --git a/src/workflow-requests.ts b/src/workflow-requests.ts
@@ -43,10 +43,14 @@ export const triggerFirstInvocation = async <TInitialPayload>(
     url: workflowContext.url,
   });
   try {
-    await workflowContext.qstashClient.publishJSON({
+    const body =
+      typeof workflowContext.requestPayload === "string"
+        ? workflowContext.requestPayload
+        : JSON.stringify(workflowContext.requestPayload);
+    await workflowContext.qstashClient.publish({
       headers,
       method: "POST",
-      body: workflowContext.requestPayload,
+      body,
       url: workflowContext.url,
     });
     return ok("success");