fix: crypto tests

Author: gustavotoyota

new-deepnotes/packages/e2ee/src/derive-group-password.test.ts

@@ -1,10 +1,8 @@
 import { describe, expect, it } from "vitest";
-import sodium from "libsodium-wrappers-sumo";
 import { deriveGroupPasswordValues, nanoidToBytes } from "./derive-group-password.js";
 
 describe("deriveGroupPasswordValues", () => {
-  it("produces deterministic output for a known group id and password", async () => {
-    await sodium.ready;
+  it("produces deterministic output for a known group id and password", () => {
     const groupId = "V1StGXR8_Z5jdHi6B-myT";
     const password = "test-password-123";
 
@@ -19,8 +17,7 @@ describe("deriveGroupPasswordValues", () => {
     expect(result1.passwordKey.value).toEqual(result2.passwordKey.value);
   });
 
-  it("uses nanoidToBytes for salt", async () => {
-    await sodium.ready;
+  it("uses nanoidToBytes for salt", () => {
     const groupId = "V1StGXR8_Z5jdHi6B-myT";
     const password = "any-password";
 

new-deepnotes/packages/e2ee/vitest.config.ts

@@ -4,5 +4,6 @@ export default defineConfig({
   test: {
     environment: "node",
     include: ["src/**/*.test.ts"],
+    testTimeout: 30_000,
   },
 });

new-deepnotes/packages/session/src/account-flows.integration.test.ts

@@ -4,7 +4,6 @@ import { fileURLToPath } from "node:url";
 import { config as loadEnv } from "dotenv";
 import { and, eq } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/postgres-js";
-import sodium from "libsodium-wrappers-sumo";
 import { nanoid } from "nanoid";
 import { authenticator } from "otplib";
 import postgres from "postgres";
@@ -130,7 +129,7 @@ function testSessionEnv(): SessionEnv {
 }
 
 function rand32(): Uint8Array {
-  return sodium.randombytes_buf(32);
+  return new Uint8Array(randomBytes(32));
 }
 
 /** First `name=value` segment from `Set-Cookie` lines (values are URI-encoded). */
@@ -468,7 +467,7 @@ describe.skipIf(resolveTemplateContext() == null)(
           password: newLogin,
           salt: phcVals.saltBytes,
         });
-        expect(sodium.memcmp(derived.hash, phcVals.hashBytes)).toBe(true);
+        expect(Buffer.from(derived.hash).equals(Buffer.from(phcVals.hashBytes))).toBe(true);
 
         const unwrapKey = derived.key;
         const privUnwrapped = createPrivateKeyring(new Uint8Array(u!.encPriv)).unwrapSymmetric(

new-deepnotes/packages/session/src/scheduled-cleanup.integration.test.ts

@@ -4,7 +4,6 @@ import { fileURLToPath } from "node:url";
 import { config as loadEnv } from "dotenv";
 import { eq } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/postgres-js";
-import sodium from "libsodium-wrappers-sumo";
 import { nanoid } from "nanoid";
 import postgres from "postgres";
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
@@ -51,7 +50,7 @@ function testSessionEnv(): SessionEnv {
 }
 
 function rand32(): Uint8Array {
-  return sodium.randombytes_buf(32);
+  return new Uint8Array(randomBytes(32));
 }
 
 async function buildRegisterBody(email: string, loginHash: Uint8Array) {