Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Remove obsolete WASM loading helpers

Manav Rathi1cc1f78d61c5
diff --git a/rust/apps/ensu/src-tauri/src/commands/crypto.rs b/rust/apps/ensu/src-tauri/src/commands/crypto.rs
index ce6e6506bc..843671b792 100644
--- a/rust/apps/ensu/src-tauri/src/commands/crypto.rs
+++ b/rust/apps/ensu/src-tauri/src/commands/crypto.rs
@@ -63,13 +63,6 @@ pub struct CryptoBlobDecryptInput {
key_b64: String,
}
-#[tauri::command]
-pub fn crypto_init() -> Result<(), ApiError> {
- // No-op, kept only for frontend compatibility: the pure-Rust crypto
- // needs no initialization.
- Ok(())
-}
-
#[tauri::command]
pub fn crypto_generate_key() -> String {
b64::encode(crypto::Key::generate().as_bytes())
diff --git a/rust/apps/ensu/src-tauri/src/main.rs b/rust/apps/ensu/src-tauri/src/main.rs
index a6dd89e1ea..7baef9b403 100644
--- a/rust/apps/ensu/src-tauri/src/main.rs
+++ b/rust/apps/ensu/src-tauri/src/main.rs
@@ -35,7 +35,6 @@ fn main() {
Ok(())
})
.invoke_handler(tauri::generate_handler![
- commands::crypto::crypto_init,
commands::crypto::crypto_generate_key,
commands::crypto::crypto_encrypt_blob,
commands::crypto::crypto_decrypt_blob,
diff --git a/rust/bindings/wasm/core/src/crypto.rs b/rust/bindings/wasm/core/src/crypto.rs
index a7e507690d..69b6f8f451 100644
--- a/rust/bindings/wasm/core/src/crypto.rs
+++ b/rust/bindings/wasm/core/src/crypto.rs
@@ -67,12 +67,6 @@ impl From<b64::DecodeError> for CryptoError {
}
}
-// Kept for existing web callers; pure Rust crypto needs no initialization.
-#[wasm_bindgen]
-pub fn crypto_init() -> Result<(), CryptoError> {
- Ok(())
-}
-
#[wasm_bindgen]
pub fn crypto_generate_key() -> String {
b64::encode(crypto::Key::generate().as_bytes())
diff --git a/web/apps/ensu/src/services/chat/attachments.ts b/web/apps/ensu/src/services/chat/attachments.ts
index a1c5495a30..438e50bb6a 100644
--- a/web/apps/ensu/src/services/chat/attachments.ts
+++ b/web/apps/ensu/src/services/chat/attachments.ts
@@ -1,5 +1,5 @@
import { base64ToBytes, bytesToBase64 } from "../base64";
-import { ensureCryptoInit, enteWasm } from "../wasm";
+import { enteWasm } from "../wasm";
const ATTACHMENT_KEY_INFO = "llmchat_attachment_v1";
const BLOB_HEADER_BYTES = 24;
@@ -37,7 +37,6 @@ export const encryptAttachmentBytes = async (
chatKeyB64: string,
sessionUuid: string,
): Promise<Uint8Array<ArrayBuffer>> => {
- await ensureCryptoInit();
const wasm = await enteWasm();
const derivedKeyB64 = await deriveAttachmentKeyB64(chatKeyB64, sessionUuid);
const plaintextB64 = bytesToBase64(bytes);
@@ -63,7 +62,6 @@ export const decryptAttachmentBytes = async (
throw new Error("Invalid attachment blob length");
}
- await ensureCryptoInit();
const wasm = await enteWasm();
const derivedKeyB64 = await deriveAttachmentKeyB64(chatKeyB64, sessionUuid);
diff --git a/web/apps/ensu/src/services/chat/chatKey.ts b/web/apps/ensu/src/services/chat/chatKey.ts
index 3de0fbad5f..d4890c7599 100644
--- a/web/apps/ensu/src/services/chat/chatKey.ts
+++ b/web/apps/ensu/src/services/chat/chatKey.ts
@@ -1,6 +1,6 @@
import { isTauriRuntime } from "@/services/tauri-runtime";
import { secureStorageGet, secureStorageSet } from "../secure-storage";
-import { ensureCryptoInit, enteWasm } from "../wasm";
+import { enteWasm } from "../wasm";
import {
hasRetiredLocalChatStore,
promoteLocalChatKey,
@@ -68,7 +68,6 @@ export const getOrCreateLocalChatKey = async () => {
throw new Error("Existing chat data has no encryption key");
}
- await ensureCryptoInit();
const chatKey = await (await enteWasm()).crypto_generate_key();
await persistLocalKey(chatKey);
return chatKey;
diff --git a/web/apps/ensu/src/services/chat/crypto.ts b/web/apps/ensu/src/services/chat/crypto.ts
index 67fd8e4f33..425848ff4d 100644
--- a/web/apps/ensu/src/services/chat/crypto.ts
+++ b/web/apps/ensu/src/services/chat/crypto.ts
@@ -1,5 +1,5 @@
import { base64ToUtf8, utf8ToBase64 } from "../base64";
-import { ensureCryptoInit, enteWasm } from "../wasm";
+import { enteWasm } from "../wasm";
export interface EncryptedChatPayload {
encryptedData: string;
@@ -12,7 +12,6 @@ export const encryptChatPayload = async (
payload: unknown,
chatKeyB64: string,
): Promise<EncryptedChatPayload> => {
- await ensureCryptoInit();
const wasm = await enteWasm();
const plaintextB64 = utf8ToBase64(JSON.stringify(payload));
@@ -28,7 +27,6 @@ export const decryptChatPayload = async (
{ encryptedData, header }: EncryptedChatPayload,
chatKeyB64: string,
): Promise<unknown> => {
- await ensureCryptoInit();
const wasm = await enteWasm();
const plaintextB64 = await wasm.crypto_decrypt_blob(
@@ -43,7 +41,6 @@ export const encryptChatField = async (
value: string,
chatKeyB64: string,
): Promise<string> => {
- await ensureCryptoInit();
const wasm = await enteWasm();
const plaintextB64 = utf8ToBase64(value);
@@ -64,7 +61,6 @@ export const decryptChatField = async (
throw new Error("Invalid encrypted field format");
}
- await ensureCryptoInit();
const wasm = await enteWasm();
const plaintextB64 = await wasm.crypto_decrypt_blob(
ciphertext,
diff --git a/web/apps/ensu/src/services/wasm.ts b/web/apps/ensu/src/services/wasm.ts
index f423938ced..f788909682 100644
--- a/web/apps/ensu/src/services/wasm.ts
+++ b/web/apps/ensu/src/services/wasm.ts
@@ -1,5 +1,4 @@
import { isTauriRuntime } from "@/services/tauri-runtime";
-import { loadEnteWasm } from "ente-core-wasm/load";
export type EnteWasmModule = typeof import("ente-core-wasm");
@@ -9,7 +8,6 @@ export interface EncryptedBlob {
}
export interface EnteCryptoAdapter {
- crypto_init(): Promise<void>;
crypto_generate_key(): Promise<string>;
crypto_encrypt_blob(
dataB64: string,
@@ -24,10 +22,6 @@ export interface EnteCryptoAdapter {
const createWasmAdapter = (wasm: EnteWasmModule): EnteCryptoAdapter => {
return {
- crypto_init: () => {
- wasm.crypto_init();
- return Promise.resolve();
- },
crypto_generate_key: () => Promise.resolve(wasm.crypto_generate_key()),
crypto_encrypt_blob: (dataB64, keyB64) =>
Promise.resolve(wasm.crypto_encrypt_blob(dataB64, keyB64)),
@@ -114,9 +108,6 @@ const createTauriAdapter = async (): Promise<EnteCryptoAdapter> => {
};
return {
- crypto_init: async () => {
- await invokeOrThrow("crypto_init");
- },
crypto_generate_key: () => invokeOrThrow<string>("crypto_generate_key"),
crypto_encrypt_blob: (dataB64, keyB64) =>
invokeOrThrow<EncryptedBlob>("crypto_encrypt_blob", {
@@ -130,23 +121,15 @@ const createTauriAdapter = async (): Promise<EnteCryptoAdapter> => {
};
let _wasmPromise: Promise<EnteCryptoAdapter> | undefined;
-let _cryptoInitDone = false;
export const enteWasm = async (): Promise<EnteCryptoAdapter> => {
_wasmPromise ??= (async () => {
if (isTauriRuntime()) {
return createTauriAdapter();
}
- const wasm = await loadEnteWasm();
+ const wasm = await import("ente-core-wasm");
return createWasmAdapter(wasm);
})();
return _wasmPromise;
};
-
-export const ensureCryptoInit = async () => {
- if (_cryptoInitDone) return;
- const wasm = await enteWasm();
- await wasm.crypto_init();
- _cryptoInitDone = true;
-};
diff --git a/web/apps/legacy/src/features/legacy-kit/recovery.ts b/web/apps/legacy/src/features/legacy-kit/recovery.ts
index f9d3dd4d20..0e17e4d89a 100644
--- a/web/apps/legacy/src/features/legacy-kit/recovery.ts
+++ b/web/apps/legacy/src/features/legacy-kit/recovery.ts
@@ -1,7 +1,6 @@
import { clientPackageName, desktopAppVersion, isDesktop } from "ente-base/app";
import { apiOrigin } from "ente-base/origins";
import type { LegacyKitRecoveryHandle } from "ente-core-wasm";
-import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
import { z } from "zod";
import type { LegacyKitShare } from "./share";
@@ -28,7 +27,7 @@ export const openLegacyKitRecovery = async (
shares: LegacyKitShare[],
email?: string,
): Promise<OpenedLegacyKitRecovery> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const handle = await wasm.legacy_kit_open_recovery({
baseUrl: await apiOrigin(),
shares,
diff --git a/web/apps/locker/src/services/crypto.ts b/web/apps/locker/src/services/crypto.ts
index 3df85bc280..ff6f749e9d 100644
--- a/web/apps/locker/src/services/crypto.ts
+++ b/web/apps/locker/src/services/crypto.ts
@@ -5,7 +5,6 @@ import type {
EncryptedFile,
KeyPair,
} from "ente-base/crypto/types";
-import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
const shouldFallbackToLegacyBlobDecrypt = (error: unknown): boolean => {
if (!error || typeof error !== "object") {
@@ -45,7 +44,7 @@ export const decryptBox = async (
box: EncryptedBox,
key: Uint8Array | string,
): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_decrypt_box(
toB64String(box.encryptedData),
toB64String(box.nonce),
@@ -65,7 +64,7 @@ export const decryptMetadataJSON = async (
blob: EncryptedBlob,
key: Uint8Array | string,
): Promise<unknown> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const encryptedData = toB64String(blob.encryptedData);
const decryptionHeader = toB64String(blob.decryptionHeader);
const keyB64 = toB64String(key);
@@ -93,7 +92,7 @@ export const boxSealOpen = async (
encryptedData: string,
keyPair: KeyPair,
): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_box_seal_open(
encryptedData,
keyPair.publicKey,
@@ -105,17 +104,17 @@ export const boxSeal = async (
dataB64: string,
publicKeyB64: string,
): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_box_seal(dataB64, publicKeyB64);
};
export const generateKey = async (): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_generate_key();
};
export const md5Base64 = async (data: Uint8Array): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_md5_base64(data);
};
@@ -123,7 +122,7 @@ export const encryptBox = async (
dataB64: string,
keyB64: string,
): Promise<{ encryptedData: string; nonce: string }> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const result = wasm.crypto_encrypt_box(dataB64, keyB64);
return { encryptedData: result.encrypted_data, nonce: result.nonce };
};
@@ -132,7 +131,7 @@ export const encryptBlob = async (
dataB64: string,
keyB64: string,
): Promise<{ encryptedData: string; decryptionHeader: string }> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const result = wasm.crypto_encrypt_blob(dataB64, keyB64);
return {
encryptedData: result.encrypted_data,
@@ -167,7 +166,7 @@ export interface StreamDecryptorHandle {
export const createStreamEncryptor =
async (): Promise<StreamEncryptorHandle> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const encryptor = new wasm.CryptoStreamEncryptor();
return {
@@ -187,7 +186,7 @@ export const createStreamDecryptor = async (
decryptionHeader: string,
keyB64: string,
): Promise<StreamDecryptorHandle> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const decryptor = new wasm.CryptoStreamDecryptor(decryptionHeader, keyB64);
return {
@@ -209,7 +208,7 @@ export interface EncryptedFileResult {
export const encryptFileStream = async (
dataB64: string,
): Promise<EncryptedFileResult> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const result = wasm.crypto_encrypt_stream(dataB64);
return {
encryptedData: result.encrypted_data,
@@ -223,7 +222,7 @@ export const encryptFileStreamWithKey = async (
dataB64: string,
keyB64: string,
): Promise<EncryptedFileResult> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const result = wasm.crypto_encrypt_stream_with_key(dataB64, keyB64);
return {
encryptedData: result.encrypted_data,
@@ -242,7 +241,7 @@ export const decryptStreamBytes = async (
file: EncryptedFile,
key: Uint8Array | string,
): Promise<Uint8Array> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const plaintextB64 = wasm.crypto_decrypt_stream(
toB64String(file.encryptedData),
toB64String(file.decryptionHeader),
diff --git a/web/apps/space/src/services/spaceBootstrapAuth.ts b/web/apps/space/src/services/spaceBootstrapAuth.ts
index fb90efb0ad..b34a7907f6 100644
--- a/web/apps/space/src/services/spaceBootstrapAuth.ts
+++ b/web/apps/space/src/services/spaceBootstrapAuth.ts
@@ -7,7 +7,6 @@ import type { SRPSetupAttributes } from "ente-accounts/services/srp";
import type { KeyAttributes } from "ente-accounts/services/user";
import { ensureOk, publicRequestHeaders } from "ente-base/http";
import { apiURL } from "ente-base/origins";
-import { loadEnteWasm } from "ente-core-wasm/load";
import { z } from "zod";
export const spaceBootstrapAuthHeaders = (authToken: string) => ({
@@ -55,7 +54,7 @@ export const setupSpaceSignupSRP = async (
{ srpSalt, srpUserID, srpVerifier, loginSubKey }: SRPSetupAttributes,
authToken: string,
) => {
- const wasm = await loadEnteWasm();
+ const wasm = await import("ente-core-wasm");
const session = new wasm.SrpSession(srpUserID, srpSalt, loginSubKey);
const setupRes = await fetch(await apiURL("/users/srp/setup"), {
diff --git a/web/packages/accounts/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.ts
index 38ca8dfb7d..6ac296b0cc 100644
--- a/web/packages/accounts/services/crypto/index.ts
+++ b/web/packages/accounts/services/crypto/index.ts
@@ -1,7 +1,6 @@
import type { Remote } from "comlink";
import { inWorker } from "ente-base/env";
import { ComlinkWorker } from "ente-base/worker/comlink-worker";
-import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
import type { DerivedKey } from "./kdf";
import * as kdf from "./kdf";
import type { KDFWorker } from "./kdf.worker";
@@ -88,12 +87,12 @@ export const deriveInteractiveKey = (password: string): Promise<DerivedKey> =>
: withKDFWorker((worker) => worker.deriveInteractiveKey(password));
export const generateKey = async (): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_generate_key();
};
export const generateKeyPair = async (): Promise<KeyPair> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const keyPair = wasm.crypto_generate_keypair();
return { publicKey: keyPair.public_key, privateKey: keyPair.secret_key };
};
@@ -102,7 +101,7 @@ export const encryptBox = async (
dataB64: string,
keyB64: string,
): Promise<EncryptedBox> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const box = wasm.crypto_encrypt_box(dataB64, keyB64);
return { encryptedData: box.encrypted_data, nonce: box.nonce };
};
@@ -111,7 +110,7 @@ export const decryptBox = async (
box: EncryptedBox,
keyB64: string,
): Promise<string> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.crypto_decrypt_box(box.encryptedData, box.nonce, keyB64);
};
@@ -119,7 +118,7 @@ export const boxSealOpenBytes = async (
encryptedData: string,
keyPair: KeyPair,
): Promise<Uint8Array> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return fromB64(
wasm.crypto_box_seal_open(
encryptedData,
@@ -135,7 +134,7 @@ export const deriveSubKeyBytes = async (
subKeyID: number,
context: string,
) => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return fromB64(
wasm.crypto_derive_subkey(
keyB64,
@@ -150,7 +149,7 @@ export const generateSRPSetupAttributesRust = async (
kekB64: string,
srpUserID: string,
) => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
const setup = wasm.auth_generate_srp_setup(
kekB64,
srpUserID,
@@ -163,11 +162,11 @@ export const generateSRPSetupAttributesRust = async (
};
export const recoveryKeyFromMnemonicOrHex = async (value: string) => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.auth_recovery_key_from_mnemonic_or_hex(value);
};
export const recoveryKeyToMnemonicRust = async (recoveryKey: string) => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.auth_recovery_key_to_mnemonic(recoveryKey);
};
diff --git a/web/packages/accounts/services/crypto/kdf.ts b/web/packages/accounts/services/crypto/kdf.ts
index 083eae49b5..84b942ea56 100644
--- a/web/packages/accounts/services/crypto/kdf.ts
+++ b/web/packages/accounts/services/crypto/kdf.ts
@@ -1,5 +1,3 @@
-import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
-
export const deriveKeyInsufficientMemoryErrorMessage =
"Failed to derive key (insufficient memory)";
@@ -53,7 +51,7 @@ export const deriveKey = async (
memLimit: number,
) => {
try {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
return wasm.auth_derive_kek(password, saltB64, memLimit, opsLimit);
} catch (error) {
throw toPlainError(error);
@@ -70,7 +68,7 @@ const normalizeDerivedKey = (result: WasmDerivedKey): DerivedKey => ({
export const deriveSensitiveKey = async (
password: string,
): Promise<DerivedKey> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
try {
return normalizeDerivedKey(wasm.auth_generate_sensitive_kek(password));
} catch (error) {
@@ -81,7 +79,7 @@ export const deriveSensitiveKey = async (
export const deriveInteractiveKey = async (
password: string,
): Promise<DerivedKey> => {
- const wasm = await loadCryptoReadyEnteWasm();
+ const wasm = await import("ente-core-wasm");
try {
return normalizeDerivedKey(
wasm.auth_generate_interactive_kek(password),
diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.ts
index b02c64bb9d..d9f2a6a6a9 100644
--- a/web/packages/accounts/services/srp.ts
+++ b/web/packages/accounts/services/srp.ts
@@ -9,7 +9,6 @@ import {
publicRequestHeaders,
} from "ente-base/http";
import { apiURL } from "ente-base/origins";
-import { loadEnteWasm } from "ente-core-wasm/load";
import { ensure } from "ente-utils/ensure";
import { v4 as uuidv4 } from "uuid";
import { z } from "zod";
@@ -105,7 +104,7 @@ const createSRPSession = async (
srpUserID: string,
loginSubKey: string,
) => {
- const wasm = await loadEnteWasm();
+ const wasm = await import("ente-core-wasm");
return new wasm.SrpSession(srpUserID, srpSalt, loginSubKey);
};
diff --git a/web/packages/contacts/index.ts b/web/packages/contacts/index.ts
index 332a50e0f1..4f2badf033 100644
--- a/web/packages/contacts/index.ts
+++ b/web/packages/contacts/index.ts
@@ -9,7 +9,6 @@ import log from "ente-base/log";
import { apiOrigin } from "ente-base/origins";
import { savedAuthToken } from "ente-base/token";
import type { ContactsCtxHandle } from "ente-core-wasm";
-import { loadEnteWasm } from "ente-core-wasm/load";
import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react";
import {
saveContactDisplayRecords,
@@ -373,7 +372,7 @@ const ensureContactsCtxOpen = async ({
if (!isCurrentSession(sessionKey, generation)) {
return;
}
- const { contacts_open_ctx } = await loadEnteWasm();
+ const { contacts_open_ctx } = await import("ente-core-wasm");
const openedCtx = (await contacts_open_ctx({
baseUrl: baseURL,
authToken,
diff --git a/web/packages/wasm/core/load.test.ts b/web/packages/wasm/core/load.test.ts
deleted file mode 100644
index ef84b7e5a4..0000000000
--- a/web/packages/wasm/core/load.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { afterEach, expect, test, vi } from "vitest";
-
-afterEach(() => {
- vi.resetModules();
- vi.restoreAllMocks();
-});
-
-test("loadEnteWasm shares the same import promise", async () => {
- const wasmModule = { crypto_init: vi.fn() };
- const importFactory = vi.fn(() => Promise.resolve(wasmModule));
- vi.doMock("ente-core-wasm", importFactory);
-
- const { loadEnteWasm } = await import("./load");
-
- const first = loadEnteWasm();
- const second = loadEnteWasm();
-
- expect(first).toBe(second);
- await expect(first).resolves.toMatchObject({
- crypto_init: wasmModule.crypto_init,
- });
- await expect(second).resolves.toMatchObject({
- crypto_init: wasmModule.crypto_init,
- });
- expect(importFactory).toHaveBeenCalledTimes(1);
-});
-
-test("loadCryptoReadyEnteWasm initializes crypto once", async () => {
- const crypto_init = vi.fn();
- const wasmModule = { crypto_init };
- const importFactory = vi.fn(() => Promise.resolve(wasmModule));
- vi.doMock("ente-core-wasm", importFactory);
-
- const { loadCryptoReadyEnteWasm } = await import("./load");
-
- const first = loadCryptoReadyEnteWasm();
- const second = loadCryptoReadyEnteWasm();
-
- expect(first).toBe(second);
-
- const [firstModule, secondModule] = await Promise.all([first, second]);
- expect(firstModule.crypto_init).toBe(crypto_init);
- expect(secondModule.crypto_init).toBe(crypto_init);
- expect(importFactory).toHaveBeenCalledTimes(1);
- expect(crypto_init).toHaveBeenCalledTimes(1);
-});
-
-test("loadCryptoReadyEnteWasm retries after crypto init failure", async () => {
- let attempts = 0;
- const crypto_init = vi.fn(() => {
- attempts += 1;
- if (attempts === 1) {
- throw new Error("init failed");
- }
- });
- const wasmModule = { crypto_init };
- vi.doMock("ente-core-wasm", () => wasmModule);
-
- const { loadCryptoReadyEnteWasm } = await import("./load");
-
- await expect(loadCryptoReadyEnteWasm()).rejects.toThrow("init failed");
- await expect(loadCryptoReadyEnteWasm()).resolves.toMatchObject({
- crypto_init,
- });
- expect(crypto_init).toHaveBeenCalledTimes(2);
-});
-
-test("loadEnteWasm retries after a failed load attempt", async () => {
- const wasmModule = { crypto_init: vi.fn() };
- let attempts = 0;
- vi.doMock("ente-core-wasm", () => {
- attempts += 1;
- if (attempts === 1) {
- throw new Error("import failed");
- }
- return Promise.resolve(wasmModule);
- });
-
- const { loadEnteWasm } = await import("./load");
-
- await expect(loadEnteWasm()).rejects.toBeTruthy();
- await expect(loadEnteWasm()).resolves.toMatchObject({
- crypto_init: wasmModule.crypto_init,
- });
- expect(attempts).toBe(2);
-});
diff --git a/web/packages/wasm/core/load.ts b/web/packages/wasm/core/load.ts
deleted file mode 100644
index ed0dfba5f1..0000000000
--- a/web/packages/wasm/core/load.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-type EnteWasmModule = typeof import("ente-core-wasm");
-
-let wasmPromise: Promise<EnteWasmModule> | undefined;
-let cryptoReadyPromise: Promise<EnteWasmModule> | undefined;
-
-export const loadEnteWasm = (): Promise<EnteWasmModule> =>
- (wasmPromise ??= import("ente-core-wasm").catch((error: unknown) => {
- wasmPromise = undefined;
- throw error;
- }));
-
-export const loadCryptoReadyEnteWasm = (): Promise<EnteWasmModule> =>
- (cryptoReadyPromise ??= loadEnteWasm()
- .then((wasm) => {
- wasm.crypto_init();
- return wasm;
- })
- .catch((error: unknown) => {
- cryptoReadyPromise = undefined;
- throw error;
- }));
diff --git a/web/packages/wasm/core/package.json b/web/packages/wasm/core/package.json
index 1bdb112d35..59c8eebb62 100644
--- a/web/packages/wasm/core/package.json
+++ b/web/packages/wasm/core/package.json
@@ -6,10 +6,6 @@
".": {
"types": "./pkg/ente_core_wasm.d.ts",
"import": "./pkg/ente_core_wasm.js"
- },
- "./load": {
- "types": "./load.ts",
- "import": "./load.ts"
}
},
"module": "./pkg/ente_core_wasm.js",