upstash · ogzhanolguncu · Dec 15, 2023 · Dec 15, 2023 · Dec 15, 2023 · Dec 15, 2023
diff --git a/pkg/commands/mod.ts b/pkg/commands/mod.ts
@@ -18,8 +18,8 @@ export * from "./flushall";
 export * from "./flushdb";
 export * from "./geo_add";
 export * from "./geo_dist";
-export * from "./geo_pos";
 export * from "./geo_hash";
+export * from "./geo_pos";
 export * from "./geo_search";
 export * from "./geo_search_store";
 export * from "./get";
@@ -86,9 +86,9 @@ export * from "./msetnx";
 export * from "./persist";
 export * from "./pexpire";
 export * from "./pexpireat";
-export * from './pfadd';
-export * from './pfcount';
-export * from './pfmerge';
+export * from "./pfadd";
+export * from "./pfcount";
+export * from "./pfmerge";
 export * from "./ping";
 export * from "./psetex";
 export * from "./pttl";
@@ -131,7 +131,11 @@ export * from "./ttl";
 export * from "./type";
 export * from "./unlink";
 export * from "./xadd";
+export * from "./xdel";
+export * from "./xlen";
 export * from "./xrange";
+export * from "./xrevrange";
+export * from "./xtrim";
 export * from "./zadd";
 export * from "./zcard";
 export * from "./zcount";

diff --git a/pkg/commands/xdel.test.ts b/pkg/commands/xdel.test.ts
@@ -0,0 +1,66 @@
+import { 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";
+
+const client = newHttpClient();
+
+const { newKey, cleanup } = keygen();
+afterAll(cleanup);
+
+describe("XDEL", () => {
+  test("should delete one item from the stream", async () => {
+    const key = newKey();
+    await new XAddCommand([key, "*", { name: "Jane", surname: "Austen" }]).exec(
+      client
+    );
+
+    const res = await new XAddCommand([
+      key,
+      "*",
+      { name: "Toni", surname: "Morrison" },
+    ]).exec(client);
+
+    const xdelRes = await new XDelCommand([key, res]).exec(client);
+    const xrangeRes = await new XRangeCommand([key, "-", "+", 1]).exec(client);
+
+    expect(Object.keys(xrangeRes).length).toBe(1);
+    expect(xdelRes).toBe(1);
+  });
+
+  test("should delete multiple items from the stream", async () => {
+    const key = newKey();
+
+    const id1 = await new XAddCommand([
+      key,
+      "*",
+      { name: "Jane", surname: "Austen" },
+    ]).exec(client);
+
+    const id2 = await new XAddCommand([
+      key,
+      "*",
+      { name: "Toni", surname: "Morrison" },
+    ]).exec(client);
+
+    const id3 = await new XAddCommand([
+      key,
+      "*",
+      { name: "Agatha", surname: "Christie" },
+    ]).exec(client);
+
+    await new XAddCommand([
+      key,
+      "*",
+      { name: "Ngozi", surname: "Adichie" },
+    ]).exec(client);
+
+    const xdelRes = await new XDelCommand([key, [id1, id2, id3]]).exec(client);
+    const xrangeRes = await new XRangeCommand([key, "-", "+", 1]).exec(client);
+
+    expect(Object.keys(xrangeRes).length).toBe(1);
+    expect(xdelRes).toBe(3);
+  });
+});
diff --git a/pkg/commands/xdel.ts b/pkg/commands/xdel.ts
@@ -0,0 +1,14 @@
+import { Command, CommandOptions } from "./command";
+
+/**
+ * @see https://redis.io/commands/xdel
+ */
+export class XDelCommand extends Command<number, number> {
+  constructor(
+    [key, ids]: [key: string, ids: string[] | string],
+    opts?: CommandOptions<number, number>
+  ) {
+    const cmds = Array.isArray(ids) ? [...ids] : [ids];
+    super(["XDEL", key, ...cmds], opts);
+  }
+}
diff --git a/pkg/commands/xlen.test.ts b/pkg/commands/xlen.test.ts
@@ -0,0 +1,39 @@
+import { keygen, newHttpClient } from "../test-utils";
+
+import { afterAll, describe, expect, test } from "bun:test";
+import { XAddCommand } from "./xadd";
+import { XLenCommand } from "./xlen";
+
+const client = newHttpClient();
+
+const { newKey, cleanup } = keygen();
+afterAll(cleanup);
+
+describe("XLEN", () => {
+  test("should give size of the stream", async () => {
+    const key = newKey();
+    await new XAddCommand([key, "*", { name: "Jane", surname: "Austen" }]).exec(
+      client
+    );
+    await new XAddCommand([
+      key,
+      "*",
+      { name: "Toni", surname: "Morrison" },
+    ]).exec(client);
+
+    await new XAddCommand([
+      key,
+      "*",
+      { name: "Hezarfen", surname: "----" },
+    ]).exec(client);
+
+    const res = await new XLenCommand([key]).exec(client);
+
+    expect(res).toBe(3);
+  });
+
+  test("should return 0 when specified key does not exist", async () => {
+    const res = await new XLenCommand(["missing-key"]).exec(client);
+    expect(res).toBe(0);
+  });
+});
diff --git a/pkg/commands/xlen.ts b/pkg/commands/xlen.ts
@@ -0,0 +1,10 @@
+import { Command, CommandOptions } from "./command";
+
+/**
+ * @see https://redis.io/commands/xlen
+ */
+export class XLenCommand extends Command<number, number> {
+  constructor(cmd: [key: string], opts?: CommandOptions<number, number>) {
+    super(["XLEN", ...cmd], opts);
+  }
+}
diff --git a/pkg/commands/xrange.test.ts b/pkg/commands/xrange.test.ts
@@ -18,7 +18,11 @@ describe("without options", () => {
     const field2 = "field2";
     const member2 = randomID();
 
-    await new XAddCommand([key, "*", { [field1]: member1, [field2]: member2 }]).exec(client);
+    await new XAddCommand([
+      key,
+      "*",
+      { [field1]: member1, [field2]: member2 },
+    ]).exec(client);
 
     const res = await new XRangeCommand([key, "-", "+"]).exec(client);
     expect(Object.keys(res).length).toBe(1);
@@ -49,7 +53,7 @@ describe("limit", () => {
   });
 });
 
-test("many fields", () => {
+describe("many fields", () => {
   test("returns all fields", async () => {
     const key = newKey();
 

diff --git a/pkg/commands/xrevrange.test.ts b/pkg/commands/xrevrange.test.ts
@@ -0,0 +1,62 @@
+import { keygen, newHttpClient } from "../test-utils";
+
+import { afterAll, beforeEach, describe, expect, test } from "bun:test";
+import { XAddCommand } from "./xadd";
+import { XRevRangeCommand } from "./xrevrange";
+
+const client = newHttpClient();
+const { newKey, cleanup } = keygen();
+const key = newKey();
+afterAll(cleanup);
+
+beforeEach(async () => {
+  await new XAddCommand([
+    key,
+    "*",
+    { name: "Virginia", surname: "Woolf" },
+  ]).exec(client);
+
+  await new XAddCommand([key, "*", { name: "Jane", surname: "Austen" }]).exec(
+    client
+  );
+
+  await new XAddCommand([key, "*", { name: "Toni", surname: "Morrison" }]).exec(
+    client
+  );
+
+  await new XAddCommand([
+    key,
+    "*",
+    { name: "Agatha", surname: "Christie" },
+  ]).exec(client);
+
+  await new XAddCommand([key, "*", { name: "Ngozi", surname: "Adichie" }]).exec(
+    client
+  );
+});
+
+describe("without options", () => {
+  test("should return stream in a reverse order", async () => {
+    const res = await new XRevRangeCommand([key, "+", "-"]).exec(client);
+
+    expect(Object.keys(res).length).toBe(5);
+    expect(Object.values(res)[0]).toEqual({
+      name: "Ngozi",
+      surname: "Adichie",
+    });
+  });
+});
+
+describe("LIMIT", () => {
+  test("should return only last two", async () => {
+    const res = await new XRevRangeCommand([key, "+", "-", 2]).exec(client);
+    expect(Object.keys(res).length).toBe(2);
+    expect(Object.values(res)).toEqual([
+      {
+        name: "Ngozi",
+        surname: "Adichie",
+      },
+      { name: "Agatha", surname: "Christie" },
+    ]);
+  });
+});
diff --git a/pkg/commands/xrevrange.ts b/pkg/commands/xrevrange.ts
@@ -0,0 +1,51 @@
+import { Command, CommandOptions } from "./command";
+
+export class XRevRangeCommand<
+  TData extends Record<string, Record<string, unknown>>
+> extends Command<string[][], TData> {
+  constructor(
+    [key, end, start, count]: [
+      key: string,
+      end: string,
+      start: string,
+      count?: number
+    ],
+    opts?: CommandOptions<unknown[], TData[]>
+  ) {
+    const command: unknown[] = ["XREVRANGE", key, end, start];
+    if (typeof count === "number") {
+      command.push("COUNT", count);
+    }
+    super(command, {
+      deserialize: (result) => deserialize<any>(result as any),
+      ...opts,
+    });
+  }
+}
+
+function deserialize<TData extends Record<string, Record<string, unknown>>>(
+  result: [string, string[]][]
+): TData {
+  const obj: Record<string, Record<string, unknown>> = {};
+  for (const e of result) {
+    while (e.length >= 2) {
+      const streamId = e.shift() as string;
+      const entries = e.shift()!;
+
+      if (!(streamId in obj)) {
+        obj[streamId] = {};
+      }
+      while (entries.length >= 2) {
+        const field = (entries as string[]).shift()! as string;
+        const value = (entries as string[]).shift()! as string;
+
+        try {
+          obj[streamId][field] = JSON.parse(value);
+        } catch {
+          obj[streamId][field] = value;
+        }
+      }
+    }
+  }
+  return obj as TData;
+}