Merge pull request #184 from upstash/DX-1300

DX-1300: fix cursor type

src/client/client.ts

@@ -227,7 +227,7 @@ export type PublishJsonRequest = Omit<PublishRequest, "body"> & {
 };
 
 export type EventsRequest = {
-  cursor?: number;
+  cursor?: string | number;
   filter?: EventsRequestFilter;
 };
 
@@ -246,7 +246,7 @@ type EventsRequestFilter = {
 };
 
 export type GetEventsResponse = {
-  cursor?: number;
+  cursor?: string;
   events: Event[];
 };
 
@@ -464,8 +464,11 @@ export class Client {
    */
   public async events(request?: EventsRequest): Promise<GetEventsResponse> {
     const query: Record<string, string> = {};
-    if (request?.cursor && request.cursor > 0) {
+
+    if (typeof request?.cursor === "number" && request.cursor > 0) {
       query.cursor = request.cursor.toString();
+    }else if (typeof request?.cursor === "string" && request.cursor !== "") {
+      query.cursor = request.cursor;
     }
 
     for (const [key, value] of Object.entries(request?.filter ?? {})) {

src/client/events.test.ts

@@ -0,0 +1,20 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import {  describe, expect, test } from "bun:test";
+import { Client } from "./client";
+import { parseCursor } from "./utils";
+
+describe("events", () => {
+  const client = new Client({ token: process.env.QSTASH_TOKEN! });
+
+  test("should use cursor", async () => {
+	const result1 = await client.events()
+
+	const result2 = await client.events({ cursor: result1.cursor })
+
+
+	if (result1.cursor && result2.cursor) {
+		expect(parseCursor(result1.cursor).timestamp).toBeGreaterThan(parseCursor(result2.cursor).timestamp);
+	}
+
+  })
+});

src/client/types.ts

@@ -19,7 +19,7 @@ export type Event = {
 export type EventPayload = Omit<Event, "urlGroup"> & { topicName: string };
 
 export type GetEventsPayload = {
-  cursor?: number;
+  cursor?: string ;
   events: EventPayload[];
 };
 

src/client/utils.ts

@@ -117,3 +117,13 @@ export function decodeBase64(base64: string) {
     return atob(base64);
   }
 }
+
+export function parseCursor(cursor: string) {
+  const [timestamp, sequence] = cursor.split("-");
+
+  return {
+    timestamp: Number.parseInt(timestamp, 10),
+    sequence: Number.parseInt(sequence, 10),
+  };
+
+}