upstash · ogzhanolguncu · Jan 5, 2024 · Jan 2, 2024 · Jan 3, 2024 · Jan 3, 2024
diff --git a/pkg/commands/mod.ts b/pkg/commands/mod.ts
@@ -130,10 +130,18 @@ export * from "./touch";
 export * from "./ttl";
 export * from "./type";
 export * from "./unlink";
+export * from "./xack";
 export * from "./xadd";
+export * from "./xautoclaim";
+export * from "./xclaim";
 export * from "./xdel";
+export * from "./xgroup";
+export * from "./xinfo";
 export * from "./xlen";
+export * from "./xpending";
 export * from "./xrange";
+export * from "./xread";
+export * from "./xreadgroup";
 export * from "./xrevrange";
 export * from "./xtrim";
 export * from "./zadd";

diff --git a/pkg/commands/xack.test.ts b/pkg/commands/xack.test.ts
@@ -0,0 +1,84 @@
+import { addNewItemToStream, keygen, newHttpClient } from "../test-utils";
+
+import { afterAll, describe, expect, test } from "bun:test";
+import { XAddCommand } from "./xadd";
+import { XDelCommand } from "./xdel";
+import { XRangeCommand } from "./xrange";
+import { XGroupCommand } from "./xgroup";
+import { XReadGroupCommand } from "./xreadgroup";
+import { XAckCommand } from "./xack";
+
+const client = newHttpClient();
+
+const { newKey, cleanup } = keygen();
+afterAll(cleanup);
+
+describe("XACK", () => {
+  test("should acknowledge a message successfully", async () => {
+    const streamKey1 = newKey();
+    const group = newKey();
+    const consumer = newKey();
+
+    const { streamId: streamId1 } = await addNewItemToStream(
+      streamKey1,
+      client
+    );
+    const { streamId: streamId2 } = await addNewItemToStream(
+      streamKey1,
+      client
+    );
+
+    await new XGroupCommand([
+      streamKey1,
+      { type: "CREATE", group, id: "0" },
+    ]).exec(client);
+
+    (await new XReadGroupCommand([
+      group,
+      consumer,
+      streamKey1,
+      ">",
+      { count: 2 },
+    ]).exec(client)) as string[];
+
+    const res = await new XAckCommand([
+      streamKey1,
+      group,
+      [streamId1, streamId2],
+    ]).exec(client);
+    expect(res).toEqual(2);
+  });
+
+  test("should try to re-acknowledge and return 0", async () => {
+    const streamKey1 = newKey();
+    const group = newKey();
+    const consumer = newKey();
+
+    const { streamId: streamId1 } = await addNewItemToStream(
+      streamKey1,
+      client
+    );
+
+    await new XGroupCommand([
+      streamKey1,
+      { type: "CREATE", group, id: "0", options: { MKSTREAM: true } },
+    ]).exec(client);
+
+    (await new XReadGroupCommand([
+      group,
+      consumer,
+      streamKey1,
+      ">",
+      { count: 2 },
+    ]).exec(client)) as string[];
+
+    const res = await new XAckCommand([streamKey1, group, streamId1]).exec(
+      client
+    );
+    expect(res).toEqual(1);
+    const res1 = await new XAckCommand([streamKey1, group, streamId1]).exec(
+      client
+    );
+    expect(res1).toEqual(0);
+  });
+});
diff --git a/pkg/commands/xack.ts b/pkg/commands/xack.ts
@@ -0,0 +1,14 @@
+import { Command, CommandOptions } from "./command";
+
+/**
+ * @see https://redis.io/commands/xack
+ */
+export class XAckCommand extends Command<number, number> {
+  constructor(
+    [key, group, id]: [key: string, group: string, id: string | string[]],
+    opts?: CommandOptions<number, number>
+  ) {
+    const ids = Array.isArray(id) ? [...id] : [id];
+    super(["XACK", key, group, ...ids], opts);
+  }
+}
diff --git a/pkg/commands/xautoclaim.test.ts b/pkg/commands/xautoclaim.test.ts
@@ -0,0 +1,146 @@
+import { addNewItemToStream, keygen, newHttpClient } from "../test-utils";
+
+import { sleep } from "bun";
+import { afterAll, describe, expect, test } from "bun:test";
+import { XAutoClaim } from "./xautoclaim";
+import { XGroupCommand } from "./xgroup";
+import { XReadGroupCommand } from "./xreadgroup";
+
+const client = newHttpClient();
+
+const { newKey, cleanup } = keygen();
+afterAll(cleanup);
+
+describe("XCLAIM", () => {
+  test("should move ownership to newly created consumer ", async () => {
+    const streamKey = newKey();
+    const group = newKey();
+    const consumer1 = newKey();
+    const consumer2 = newKey();
+
+    await addNewItemToStream(streamKey, client);
+    await addNewItemToStream(streamKey, client);
+
+    await new XGroupCommand([
+      streamKey,
+      { type: "CREATE", group, id: "0" },
+    ]).exec(client);
+
+    await new XReadGroupCommand([
+      group,
+      consumer1,
+      [streamKey],
+      [">"],
+      { count: 2 },
+    ]).exec(client);
+
+    const res = (await new XAutoClaim([
+      streamKey,
+      group,
+      consumer2,
+      10,
+      "0-0",
+      { count: 1 },
+    ]).exec(client)) as string[];
+    expect(res).toBeInstanceOf(Array);
+  });
+
+  test("should try to move ownership and fail due to too high idle time", async () => {
+    const streamKey = newKey();
+    const group = newKey();
+    const consumer1 = newKey();
+    const consumer2 = newKey();
+
+    await addNewItemToStream(streamKey, client);
+    await addNewItemToStream(streamKey, client);
+
+    await new XGroupCommand([
+      streamKey,
+      { type: "CREATE", group, id: "0" },
+    ]).exec(client);
+
+    await new XReadGroupCommand([
+      group,
+      consumer1,
+      [streamKey],
+      [">"],
+      { count: 2 },
+    ]).exec(client);
+    await sleep(2000);
+    const res = (await new XAutoClaim([
+      streamKey,
+      group,
+      consumer2,
+      3000,
+      "0-0",
+      { count: 1 },
+    ]).exec(client)) as string[];
+    expect(res).toEqual(["0-0", []]);
+  });
+
+  test("should successfull move the ownership with idle time", async () => {
+    const streamKey = newKey();
+    const group = newKey();
+    const consumer1 = newKey();
+    const consumer2 = newKey();
+
+    await addNewItemToStream(streamKey, client);
+    const { streamId } = await addNewItemToStream(streamKey, client);
+
+    await new XGroupCommand([
+      streamKey,
+      { type: "CREATE", group, id: "0" },
+    ]).exec(client);
+
+    await new XReadGroupCommand([
+      group,
+      consumer1,
+      [streamKey],
+      [">"],
+      { count: 2 },
+    ]).exec(client);
+    await sleep(2000);
+    const xclaim = (await new XAutoClaim([
+      streamKey,
+      group,
+      consumer2,
+      1000,
+      "0-0",
+      { count: 1 },
+    ]).exec(client)) as string[];
+    expect(xclaim[0]).toEqual(streamId);
+  });
+
+  test("should successfull return justid", async () => {
+    const streamKey = newKey();
+    const group = newKey();
+    const consumer1 = newKey();
+    const consumer2 = newKey();
+
+    await addNewItemToStream(streamKey, client);
+    const { streamId } = await addNewItemToStream(streamKey, client);
+
+    await new XGroupCommand([
+      streamKey,
+      { type: "CREATE", group, id: "0" },
+    ]).exec(client);
+
+    await new XReadGroupCommand([
+      group,
+      consumer1,
+      [streamKey],
+      [">"],
+      { count: 2 },
+    ]).exec(client);
+
+    const xclaim = (await new XAutoClaim([
+      streamKey,
+      group,
+      consumer2,
+      0,
+      "0-0",
+      { count: 1, justId: true },
+    ]).exec(client)) as string[];
+    expect(xclaim[1].length).toBe(1);
+  });
+});
diff --git a/pkg/commands/xautoclaim.ts b/pkg/commands/xautoclaim.ts
@@ -0,0 +1,32 @@
+import { Command, CommandOptions } from "./command";
+
+/**
+ * @see https://redis.io/commands/xautoclaim
+ */
+export class XAutoClaim extends Command<unknown[], unknown[]> {
+  constructor(
+    [key, group, consumer, minIdleTime, start, options]: [
+      key: string,
+      group: string,
+      consumer: string,
+      minIdleTime: number,
+      start: string,
+      options?: { count?: number; justId?: boolean }
+    ],
+    opts?: CommandOptions<unknown[], unknown[]>
+  ) {
+    const commands: unknown[] = [];
+
+    if (options?.count) {
+      commands.push("COUNT", options.count);
+    }
+
+    if (options?.justId) {
+      commands.push("JUSTID");
+    }
+    super(
+      ["XAUTOCLAIM", key, group, consumer, minIdleTime, start, ...commands],
+      opts
+    );
+  }
+}