upstash · ogzhanolguncu · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023
diff --git a/deno.lock b/deno.lock
diff --git a/pkg/commands/hgetall.test.ts b/pkg/commands/hgetall.test.ts
@@ -1,8 +1,13 @@
-import { keygen, newHttpClient, randomID } from "../test-utils.ts";
 import { assertEquals } from "https://deno.land/[email protected]/testing/asserts.ts";
 import { afterAll } from "https://deno.land/[email protected]/testing/bdd.ts";
-import { HSetCommand } from "./hset.ts";
+import {
+  keygen,
+  newHttpClient,
+  randomID,
+  randomUnsafeIntegerString,
+} from "../test-utils.ts";
 import { HGetAllCommand } from "./hgetall.ts";
+import { HSetCommand } from "./hset.ts";
 
 const client = newHttpClient();
 
@@ -29,3 +34,21 @@ Deno.test("when hash does not exist", async (t) => {
     assertEquals(res, null);
   });
 });
+Deno.test("properly return bigint precisely", async () => {
+  const key = newKey();
+  const field3 = randomID();
+  const field2 = randomID();
+  const field1 = randomID();
+  const value1 = false;
+  const value2 = randomID();
+  const value3 = randomUnsafeIntegerString();
+  await new HSetCommand([
+    key,
+    { [field1]: value1, [field2]: value2, [field3]: value3 },
+  ]).exec(client);
+
+  const res = await new HGetAllCommand([key]).exec(client);
+
+  const obj = { [field1]: value1, [field2]: value2, [field3]: value3 };
+  assertEquals(res, obj);
+});
diff --git a/pkg/commands/hgetall.ts b/pkg/commands/hgetall.ts
@@ -11,7 +11,14 @@ function deserialize<TData extends Record<string, unknown>>(
     const key = result.shift()!;
     const value = result.shift()!;
     try {
-      obj[key] = JSON.parse(value);
+      // handle unsafe integer
+      const valueIsNumberAndNotSafeInteger = !isNaN(Number(value)) &&
+        !Number.isSafeInteger(value);
+      if (valueIsNumberAndNotSafeInteger) {
+        obj[key] = value;
+      } else {
+        obj[key] = JSON.parse(value);
+      }
     } catch {
       obj[key] = value;
     }

diff --git a/pkg/test-utils.test.ts b/pkg/test-utils.test.ts
@@ -0,0 +1,22 @@
+import {
+  assertEquals,
+  assertFalse,
+} from "https://deno.land/[email protected]/testing/asserts.ts";
+import { randomUnsafeIntegerString } from "./test-utils.ts";
+
+Deno.test("randomUnsafeIntegerString() should return a string", () => {
+  const result = randomUnsafeIntegerString();
+  assertEquals(typeof result, "string");
+});
+Deno.test("randomUnsafeIntegerString() should return different values", () => {
+  const result1 = randomUnsafeIntegerString();
+  const result2 = randomUnsafeIntegerString();
+  assertEquals(result1 !== result2, true);
+});
+Deno.test(
+  "randomUnsafeIntegerString() should return a string with unsafe integer",
+  () => {
+    const result = randomUnsafeIntegerString();
+    assertFalse(Number.isSafeInteger(Number(result)));
+  },
+);
diff --git a/pkg/test-utils.ts b/pkg/test-utils.ts
@@ -14,6 +14,13 @@ export function randomID(): string {
   }
   return btoa(s.join(""));
 }
+export const randomUnsafeIntegerString = (): string => {
+  const buffer = new Uint8Array(8);
+  crypto.getRandomValues(buffer);
+  const dataView = new DataView(buffer.buffer);
+  const unsafeInteger = dataView.getBigInt64(0, true); // true for little-endian
+  return unsafeInteger.toString();
+};
 export const newHttpClient = () => {
   const url = Deno.env.get("UPSTASH_REDIS_REST_URL");
   if (!url) {