Skip to content

armgit / ente

Public Imported from GitHub
0

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

Replace core WASM with prelogin artifact

Manav Rathif33c9eb73e0d
diff --git a/.github/workflows/ensu-build.yml b/.github/workflows/ensu-build.yml
index d6067a1160..98443d5bec 100644
--- a/.github/workflows/ensu-build.yml
+++ b/.github/workflows/ensu-build.yml
@@ -151,10 +151,6 @@ jobs:
working-directory: web
run: npm ci
- - name: Build WASM
- working-directory: web
- run: npm run build:core-wasm
-
- name: Install Tauri dependencies
run: npm ci --prefix rust/apps/ensu
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index c5d52fd9b0..2c53fd76f7 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2478,17 +2478,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "ente-core-wasm"
-version = "0.0.0"
-dependencies = [
- "ente-accounts",
- "ente-core",
- "ente-wasm-lib",
- "ente-wasm-log",
- "wasm-bindgen",
-]
-
[[package]]
name = "ente-ensu"
version = "0.0.0"
@@ -2763,6 +2752,14 @@ dependencies = [
"ente-wasm-log",
]
+[[package]]
+name = "ente-prelogin-wasm"
+version = "0.0.0"
+dependencies = [
+ "ente-wasm-lib",
+ "ente-wasm-log",
+]
+
[[package]]
name = "ente-rs"
version = "0.0.1"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 01e35d67f2..0a3c11d8f9 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -13,14 +13,14 @@ members = [
"bindings/uniffi/ensu",
"bindings/uniffi/log",
"bindings/wasm/cast",
- "bindings/wasm/core-wasm",
"bindings/wasm/ensu",
"bindings/wasm/legacy",
"bindings/wasm/lib",
- "bindings/wasm/log",
"bindings/wasm/locker",
+ "bindings/wasm/log",
"bindings/wasm/paste",
"bindings/wasm/photos",
+ "bindings/wasm/prelogin",
"bindings/wasm/space",
"crates/accounts",
"crates/assets",
diff --git a/rust/apps/ensu/scripts/tauri-dev.mjs b/rust/apps/ensu/scripts/tauri-dev.mjs
index 8141018722..33975d6789 100644
--- a/rust/apps/ensu/scripts/tauri-dev.mjs
+++ b/rust/apps/ensu/scripts/tauri-dev.mjs
@@ -18,7 +18,7 @@ const desktopVersion = config.version;
if (!desktopVersion) throw new Error("Missing Ensu desktop version");
config.build = config.build || {};
-config.build.beforeDevCommand = `node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:core-wasm && NEXT_PUBLIC_ENSU_DESKTOP_VERSION=${desktopVersion} npm exec --workspace ensu -- next dev --webpack -p ${port}`;
+config.build.beforeDevCommand = `node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:ensu-wasm && NEXT_PUBLIC_ENSU_DESKTOP_VERSION=${desktopVersion} npm exec --workspace ensu -- next dev --webpack -p ${port}`;
config.build.devUrl = `http://localhost:${port}`;
await fs.writeFile(devConfigPath, JSON.stringify(config, null, 2));
diff --git a/rust/apps/ensu/src-tauri/tauri.conf.json b/rust/apps/ensu/src-tauri/tauri.conf.json
index f1fa91f32c..fcc8c3daea 100644
--- a/rust/apps/ensu/src-tauri/tauri.conf.json
+++ b/rust/apps/ensu/src-tauri/tauri.conf.json
@@ -5,7 +5,7 @@
"identifier": "io.ente.ensu",
"mainBinaryName": "Ensu",
"build": {
- "beforeDevCommand": "node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:core-wasm && npm exec --workspace ensu -- next dev --webpack -p 3010",
+ "beforeDevCommand": "node ../../../web/scripts/check-deps.mjs && cd ../../../web && npm run build:ensu-wasm && npm exec --workspace ensu -- next dev --webpack -p 3010",
"beforeBuildCommand": "node scripts/tauri-build-web.mjs",
"devUrl": "http://localhost:3010",
"frontendDist": "../../../../web/apps/ensu/out"
diff --git a/rust/bindings/wasm/core-wasm/Cargo.toml b/rust/bindings/wasm/core-wasm/Cargo.toml
deleted file mode 100644
index a913def697..0000000000
--- a/rust/bindings/wasm/core-wasm/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "ente-core-wasm"
-edition = "2024"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-ente-accounts.workspace = true
-ente-core.workspace = true
-ente-wasm-lib = { workspace = true, features = ["accounts", "crypto"] }
-ente-wasm-log.workspace = true
-wasm-bindgen.workspace = true
diff --git a/rust/bindings/wasm/core-wasm/src/crypto.rs b/rust/bindings/wasm/core-wasm/src/crypto.rs
deleted file mode 100644
index 4fde0bcb39..0000000000
--- a/rust/bindings/wasm/core-wasm/src/crypto.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use ente_core::{b64, crypto};
-use ente_wasm_lib::crypto::Error;
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen(getter_with_clone)]
-pub struct CryptoKeyPair {
- #[wasm_bindgen(readonly, js_name = publicKey)]
- pub public_key: String,
- #[wasm_bindgen(readonly, js_name = privateKey)]
- pub private_key: String,
-}
-
-#[wasm_bindgen(js_name = cryptoGenerateKeyPair)]
-pub fn crypto_generate_keypair() -> CryptoKeyPair {
- let secret_key = crypto::SecretKey::generate();
- CryptoKeyPair {
- public_key: b64::encode(secret_key.public_key().as_bytes()),
- private_key: b64::encode(secret_key.as_bytes()),
- }
-}
-
-#[wasm_bindgen(js_name = cryptoDeriveSubKey)]
-pub fn crypto_derive_subkey(
- key_b64: &str,
- subkey_len: usize,
- subkey_id: u64,
- context: &str,
-) -> Result<String, Error> {
- let key = b64::decode(key_b64)?;
- let context: [u8; 8] = context.as_bytes().try_into().map_err(|_| {
- crypto::Error::InvalidKeyDerivationParams("KDF context must be exactly 8 bytes".into())
- })?;
- let subkey = crypto::kdf::derive_subkey(
- &crypto::Key::try_from_slice(&key)?,
- subkey_len,
- subkey_id,
- &context,
- )?;
- Ok(b64::encode(&subkey))
-}
diff --git a/rust/bindings/wasm/lib/Cargo.toml b/rust/bindings/wasm/lib/Cargo.toml
index 9f14628cda..64e65397fb 100644
--- a/rust/bindings/wasm/lib/Cargo.toml
+++ b/rust/bindings/wasm/lib/Cargo.toml
@@ -15,6 +15,7 @@ contacts = [
crypto = []
crypto-file = ["crypto", "dep:md-5"]
crypto-seal = ["crypto"]
+prelogin = ["accounts", "crypto"]
session = []
[dependencies]
diff --git a/rust/bindings/wasm/lib/src/lib.rs b/rust/bindings/wasm/lib/src/lib.rs
index dc78603c5e..b54819f22c 100644
--- a/rust/bindings/wasm/lib/src/lib.rs
+++ b/rust/bindings/wasm/lib/src/lib.rs
@@ -4,5 +4,7 @@ pub mod accounts;
pub mod contacts;
#[cfg(feature = "crypto")]
pub mod crypto;
+#[cfg(feature = "prelogin")]
+mod prelogin;
#[cfg(feature = "session")]
pub mod session;
diff --git a/rust/bindings/wasm/core-wasm/src/auth.rs b/rust/bindings/wasm/lib/src/prelogin.rs
similarity index 50%
rename from rust/bindings/wasm/core-wasm/src/auth.rs
rename to rust/bindings/wasm/lib/src/prelogin.rs
index 436a09d957..771f75bef0 100644
--- a/rust/bindings/wasm/core-wasm/src/auth.rs
+++ b/rust/bindings/wasm/lib/src/prelogin.rs
@@ -1,57 +1,44 @@
+use crate::{
+ accounts::{Error as AccountsError, GeneratedKek},
+ crypto::Error as CryptoError,
+};
use ente_accounts::auth;
-use ente_core::b64;
-use ente_wasm_lib::accounts::{Error, GeneratedKek};
+use ente_core::{b64, crypto};
use wasm_bindgen::prelude::*;
-#[wasm_bindgen]
+#[wasm_bindgen(getter_with_clone)]
pub struct GeneratedSrpSetup {
- srp_salt: String,
- srp_verifier: String,
- login_sub_key: String,
-}
-
-#[wasm_bindgen]
-impl GeneratedSrpSetup {
- #[wasm_bindgen(getter)]
- pub fn srp_salt(&self) -> String {
- self.srp_salt.clone()
- }
-
- #[wasm_bindgen(getter)]
- pub fn srp_verifier(&self) -> String {
- self.srp_verifier.clone()
- }
-
- #[wasm_bindgen(getter)]
- pub fn login_sub_key(&self) -> String {
- self.login_sub_key.clone()
- }
+ #[wasm_bindgen(readonly, js_name = srpSalt)]
+ pub srp_salt: String,
+ #[wasm_bindgen(readonly, js_name = srpVerifier)]
+ pub srp_verifier: String,
+ #[wasm_bindgen(readonly, js_name = loginSubKey)]
+ pub login_sub_key: String,
}
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = authDeriveKek)]
pub fn auth_derive_kek(
password: &str,
kek_salt_b64: &str,
mem_limit: u32,
ops_limit: u32,
-) -> Result<String, Error> {
+) -> Result<String, AccountsError> {
let kek = auth::derive_kek(password, kek_salt_b64, mem_limit, ops_limit)?;
Ok(b64::encode(&kek))
}
-#[wasm_bindgen]
-pub fn auth_generate_sensitive_kek(password: &str) -> Result<GeneratedKek, Error> {
+#[wasm_bindgen(js_name = authGenerateSensitiveKek)]
+pub fn auth_generate_sensitive_kek(password: &str) -> Result<GeneratedKek, AccountsError> {
Ok(auth::generate_sensitive_kek(password)?.into())
}
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = authGenerateSrpSetup)]
pub fn auth_generate_srp_setup(
kek_b64: &str,
srp_user_id: &str,
-) -> Result<GeneratedSrpSetup, Error> {
+) -> Result<GeneratedSrpSetup, AccountsError> {
let kek =
b64::decode(kek_b64).map_err(|e| ente_accounts::Error::Decode(format!("kek: {e}")))?;
-
let generated = auth::generate_srp_setup(&kek, srp_user_id)?;
Ok(GeneratedSrpSetup {
srp_salt: b64::encode(&generated.srp_salt),
@@ -60,14 +47,14 @@ pub fn auth_generate_srp_setup(
})
}
-#[wasm_bindgen]
-pub fn auth_recovery_key_from_mnemonic_or_hex(input: &str) -> Result<String, Error> {
+#[wasm_bindgen(js_name = authRecoveryKeyFromMnemonicOrHex)]
+pub fn auth_recovery_key_from_mnemonic_or_hex(input: &str) -> Result<String, AccountsError> {
let recovery_key = auth::recovery_key_from_mnemonic_or_hex(input)?;
Ok(b64::encode(&recovery_key))
}
-#[wasm_bindgen]
-pub fn auth_recovery_key_to_mnemonic(recovery_key_b64: &str) -> Result<String, Error> {
+#[wasm_bindgen(js_name = authRecoveryKeyToMnemonic)]
+pub fn auth_recovery_key_to_mnemonic(recovery_key_b64: &str) -> Result<String, AccountsError> {
auth::recovery_key_to_mnemonic(recovery_key_b64).map_err(Into::into)
}
@@ -83,31 +70,70 @@ impl SrpSession {
srp_user_id: &str,
srp_salt_b64: &str,
login_key_b64: &str,
- ) -> Result<SrpSession, Error> {
+ ) -> Result<SrpSession, AccountsError> {
let srp_salt = b64::decode(srp_salt_b64)
- .map_err(|e| ente_accounts::Error::Decode(format!("srp_salt: {}", e)))?;
+ .map_err(|e| ente_accounts::Error::Decode(format!("srp_salt: {e}")))?;
let login_key = b64::decode(login_key_b64)
- .map_err(|e| ente_accounts::Error::Decode(format!("login_key: {}", e)))?;
-
+ .map_err(|e| ente_accounts::Error::Decode(format!("login_key: {e}")))?;
let inner = auth::SrpSession::new(srp_user_id, &srp_salt, &login_key)?;
Ok(Self { inner })
}
+ #[wasm_bindgen(js_name = publicA)]
pub fn public_a(&self) -> String {
b64::encode(&self.inner.public_a())
}
- pub fn compute_m1(&mut self, srp_b_b64: &str) -> Result<String, Error> {
+ #[wasm_bindgen(js_name = computeM1)]
+ pub fn compute_m1(&mut self, srp_b_b64: &str) -> Result<String, AccountsError> {
let srp_b = b64::decode(srp_b_b64)
- .map_err(|e| ente_accounts::Error::Decode(format!("srpB: {}", e)))?;
+ .map_err(|e| ente_accounts::Error::Decode(format!("srpB: {e}")))?;
let m1 = self.inner.compute_m1(&srp_b)?;
Ok(b64::encode(&m1))
}
- pub fn verify_m2(&self, srp_m2_b64: &str) -> Result<(), Error> {
+ #[wasm_bindgen(js_name = verifyM2)]
+ pub fn verify_m2(&self, srp_m2_b64: &str) -> Result<(), AccountsError> {
let srp_m2 = b64::decode(srp_m2_b64)
- .map_err(|e| ente_accounts::Error::Decode(format!("srpM2: {}", e)))?;
+ .map_err(|e| ente_accounts::Error::Decode(format!("srpM2: {e}")))?;
self.inner.verify_m2(&srp_m2)?;
Ok(())
}
}
+
+#[wasm_bindgen(getter_with_clone)]
+pub struct CryptoKeyPair {
+ #[wasm_bindgen(readonly, js_name = publicKey)]
+ pub public_key: String,
+ #[wasm_bindgen(readonly, js_name = privateKey)]
+ pub private_key: String,
+}
+
+#[wasm_bindgen(js_name = cryptoGenerateKeyPair)]
+pub fn crypto_generate_key_pair() -> CryptoKeyPair {
+ let secret_key = crypto::SecretKey::generate();
+ CryptoKeyPair {
+ public_key: b64::encode(secret_key.public_key().as_bytes()),
+ private_key: b64::encode(secret_key.as_bytes()),
+ }
+}
+
+#[wasm_bindgen(js_name = cryptoDeriveSubKey)]
+pub fn crypto_derive_sub_key(
+ key_b64: &str,
+ sub_key_length: usize,
+ sub_key_id: u64,
+ context: &str,
+) -> Result<String, CryptoError> {
+ let key = b64::decode(key_b64)?;
+ let context: [u8; 8] = context.as_bytes().try_into().map_err(|_| {
+ crypto::Error::InvalidKeyDerivationParams("KDF context must be exactly 8 bytes".into())
+ })?;
+ let sub_key = crypto::kdf::derive_subkey(
+ &crypto::Key::try_from_slice(&key)?,
+ sub_key_length,
+ sub_key_id,
+ &context,
+ )?;
+ Ok(b64::encode(&sub_key))
+}
diff --git a/rust/bindings/wasm/prelogin/Cargo.toml b/rust/bindings/wasm/prelogin/Cargo.toml
new file mode 100644
index 0000000000..1f03dd8009
--- /dev/null
+++ b/rust/bindings/wasm/prelogin/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "ente-prelogin-wasm"
+edition = "2024"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+ente-wasm-lib = { workspace = true, features = ["prelogin"] }
+ente-wasm-log.workspace = true
diff --git a/rust/bindings/wasm/core-wasm/src/lib.rs b/rust/bindings/wasm/prelogin/src/lib.rs
similarity index 50%
rename from rust/bindings/wasm/core-wasm/src/lib.rs
rename to rust/bindings/wasm/prelogin/src/lib.rs
index ceb5a7ab4b..49bcbd3c6c 100644
--- a/rust/bindings/wasm/core-wasm/src/lib.rs
+++ b/rust/bindings/wasm/prelogin/src/lib.rs
@@ -1,4 +1,2 @@
+use ente_wasm_lib as _;
use ente_wasm_log as _;
-
-mod auth;
-mod crypto;
diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index a6528db08c..b8a09e0268 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -15,7 +15,7 @@ import {
} from "@mui/material";
import { useColorScheme } from "@mui/material/styles";
import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
-import { masterKeyFromSession } from "ente-accounts/services/core-session";
+import { masterKeyFromSession } from "ente-accounts/services/prelogin-session";
import { stashRedirect } from "ente-accounts/services/redirect";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LoadingIndicator } from "ente-base/components/loaders";
diff --git a/web/apps/space/package.json b/web/apps/space/package.json
index a4cbdb6105..44039297c5 100644
--- a/web/apps/space/package.json
+++ b/web/apps/space/package.json
@@ -12,8 +12,8 @@
"@hugeicons/react": "1.1.4",
"ente-accounts": "*",
"ente-base": "*",
- "ente-core-wasm": "*",
"ente-media": "*",
+ "ente-prelogin-wasm": "*",
"ente-space-wasm": "*",
"photoswipe": "5.4.4",
"react-easy-crop": "5.5.7",
diff --git a/web/apps/space/src/services/bootstrap-auth.ts b/web/apps/space/src/services/bootstrap-auth.ts
index d9885572de..788213e489 100644
--- a/web/apps/space/src/services/bootstrap-auth.ts
+++ b/web/apps/space/src/services/bootstrap-auth.ts
@@ -7,7 +7,7 @@ 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 { createSRPSession } from "ente-core-wasm";
+import { createSRPSession } from "ente-prelogin-wasm";
import { z } from "zod";
export const spaceBootstrapAuthHeaders = (authToken: string) => ({
@@ -64,7 +64,7 @@ export const setupSpaceSignupSRP = async (
srpUserID,
srpSalt,
srpVerifier,
- srpA: session.public_a(),
+ srpA: session.publicA(),
}),
});
ensureOk(setupRes);
@@ -73,10 +73,10 @@ export const setupSpaceSignupSRP = async (
const completeRes = await fetch(await apiURL("/users/srp/complete"), {
method: "POST",
headers: spaceBootstrapAuthHeaders(authToken),
- body: JSON.stringify({ setupID, srpM1: session.compute_m1(srpB) }),
+ body: JSON.stringify({ setupID, srpM1: session.computeM1(srpB) }),
});
ensureOk(completeRes);
const { srpM2 } = CompleteSRPSetupResponse.parse(await completeRes.json());
- session.verify_m2(srpM2);
+ session.verifyM2(srpM2);
};
diff --git a/web/package-lock.json b/web/package-lock.json
index 11772df7a6..b6038d438a 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -349,8 +349,8 @@
"@hugeicons/react": "1.1.4",
"ente-accounts": "*",
"ente-base": "*",
- "ente-core-wasm": "*",
"ente-media": "*",
+ "ente-prelogin-wasm": "*",
"ente-space-wasm": "*",
"photoswipe": "5.4.4",
"react-easy-crop": "5.5.7",
@@ -4744,10 +4744,6 @@
"resolved": "packages/contacts",
"link": true
},
- "node_modules/ente-core-wasm": {
- "resolved": "packages/wasm/core",
- "link": true
- },
"node_modules/ente-ensu-wasm": {
"resolved": "packages/wasm/ensu",
"link": true
@@ -4780,6 +4776,10 @@
"resolved": "packages/wasm/photos",
"link": true
},
+ "node_modules/ente-prelogin-wasm": {
+ "resolved": "packages/wasm/prelogin",
+ "link": true
+ },
"node_modules/ente-space-wasm": {
"resolved": "packages/wasm/space",
"link": true
@@ -11173,7 +11173,7 @@
"@hugeicons/react": "1.1.6",
"comlink": "4.4.2",
"ente-base": "*",
- "ente-core-wasm": "*",
+ "ente-prelogin-wasm": "*",
"react": "19.2.7",
"react-dom": "19.2.7",
"uuid": "13.0.2",
@@ -11267,9 +11267,9 @@
"devDependencies": {
"@types/react": "19.2.17",
"ente-build-config": "*",
- "ente-core-wasm": "*",
"ente-locker-wasm": "*",
"ente-photos-wasm": "*",
+ "ente-prelogin-wasm": "*",
"vite-plugin-wasm": "3.6.0",
"vitest": "4.1.8"
}
@@ -11360,19 +11360,6 @@
"wasm-pack": "0.15.0"
}
},
- "packages/wasm/core": {
- "name": "ente-core-wasm",
- "version": "0.0.0",
- "dependencies": {
- "ente-utils": "*"
- },
- "devDependencies": {
- "ente-build-config": "*",
- "vite-plugin-wasm": "3.6.0",
- "vitest": "4.1.8",
- "wasm-pack": "0.15.0"
- }
- },
"packages/wasm/ensu": {
"name": "ente-ensu-wasm",
"version": "0.0.0",
@@ -11428,6 +11415,19 @@
"wasm-pack": "0.15.0"
}
},
+ "packages/wasm/prelogin": {
+ "name": "ente-prelogin-wasm",
+ "version": "0.0.0",
+ "dependencies": {
+ "ente-utils": "*"
+ },
+ "devDependencies": {
+ "ente-build-config": "*",
+ "vite-plugin-wasm": "3.6.0",
+ "vitest": "4.1.8",
+ "wasm-pack": "0.15.0"
+ }
+ },
"packages/wasm/space": {
"name": "ente-space-wasm",
"version": "0.0.0",
diff --git a/web/package.json b/web/package.json
index f6f047c772..690a0bf569 100644
--- a/web/package.json
+++ b/web/package.json
@@ -9,50 +9,50 @@
],
"scripts": {
"build": "npm run build:photos",
- "build:accounts": "npm run build:core-wasm && npm exec --workspace accounts -- next build --webpack",
- "build:albums": "npm run build:core-wasm && npm exec --workspace albums -- next build --webpack",
- "build:auth": "npm run build:core-wasm && npm exec --workspace auth -- next build --webpack",
- "build:cast": "npm run build:core-wasm && npm run build:cast-wasm && npm exec --workspace cast -- next build --webpack",
+ "build:accounts": "npm run build:prelogin-wasm && npm exec --workspace accounts -- next build --webpack",
+ "build:albums": "npm run build:prelogin-wasm && npm exec --workspace albums -- next build --webpack",
+ "build:auth": "npm run build:prelogin-wasm && npm exec --workspace auth -- next build --webpack",
+ "build:cast": "npm run build:prelogin-wasm && npm run build:cast-wasm && npm exec --workspace cast -- next build --webpack",
"build:cast-wasm": "npm run build --workspace ente-cast-wasm",
- "build:core-wasm": "npm run build --workspace ente-core-wasm",
- "build:embed": "npm run build:core-wasm && npm exec --workspace embed -- next build --webpack",
+ "build:embed": "npm run build:prelogin-wasm && npm exec --workspace embed -- next build --webpack",
"build:ensu": "npm run build:ensu-wasm && npm exec --workspace ensu -- next build --webpack",
"build:ensu-wasm": "npm run build --workspace ente-ensu-wasm",
"build:legacy": "npm run build:legacy-wasm && npm exec --workspace legacy -- next build --webpack",
"build:legacy-wasm": "npm run build --workspace ente-legacy-wasm",
- "build:locker": "npm run build:core-wasm && npm run build:legacy-wasm && npm run build:locker-wasm && npm exec --workspace locker -- next build --webpack",
+ "build:locker": "npm run build:prelogin-wasm && npm run build:legacy-wasm && npm run build:locker-wasm && npm exec --workspace locker -- next build --webpack",
"build:locker-wasm": "npm run build --workspace ente-locker-wasm",
- "build:memories": "npm run build:core-wasm && npm exec --workspace memories -- next build --webpack && npm run build:post --workspace memories",
+ "build:memories": "npm run build:prelogin-wasm && npm exec --workspace memories -- next build --webpack && npm run build:post --workspace memories",
"build:paste": "npm run build:paste-wasm && npm exec --workspace paste -- next build --webpack && npm run build:post --workspace paste",
"build:paste-wasm": "npm run build --workspace ente-paste-wasm",
"build:payments": "npm run build --workspace payments",
- "build:photos": "npm run build:core-wasm && npm run build:cast-wasm && npm run build:photos-wasm && npm exec --workspace photos -- next build --webpack",
+ "build:photos": "npm run build:prelogin-wasm && npm run build:cast-wasm && npm run build:photos-wasm && npm exec --workspace photos -- next build --webpack",
"build:photos-wasm": "npm run build --workspace ente-photos-wasm",
- "build:share": "npm run build:core-wasm && npm exec --workspace share -- next build --webpack && npm run build:post --workspace share",
- "build:space": "npm run build:core-wasm && npm run build:space-wasm && npm exec --workspace space -- next build --webpack && npm run build:post --workspace space",
+ "build:prelogin-wasm": "npm run build --workspace ente-prelogin-wasm",
+ "build:share": "npm run build:prelogin-wasm && npm exec --workspace share -- next build --webpack && npm run build:post --workspace share",
+ "build:space": "npm run build:prelogin-wasm && npm run build:space-wasm && npm exec --workspace space -- next build --webpack && npm run build:post --workspace space",
"build:space-wasm": "npm run build --workspace ente-space-wasm",
"build:twoof3": "npm exec --workspace twoof3 -- next build --webpack",
- "build:wasm": "npm run build:core-wasm && npm run build:cast-wasm && npm run build:ensu-wasm && npm run build:legacy-wasm && npm run build:locker-wasm && npm run build:paste-wasm && npm run build:photos-wasm && npm run build:space-wasm",
+ "build:wasm": "npm run build:prelogin-wasm && npm run build:cast-wasm && npm run build:ensu-wasm && npm run build:legacy-wasm && npm run build:locker-wasm && npm run build:paste-wasm && npm run build:photos-wasm && npm run build:space-wasm",
"check:wasm-imports": "eslint --config checks/wasm-imports/eslint.config.mjs --parser @typescript-eslint/parser --no-inline-config --max-warnings 0 apps packages && node checks/wasm-imports/entrypoints.mjs && node --test checks/wasm-imports/test.mjs",
"dev": "npm run dev:photos",
- "dev:accounts": "npm run build:core-wasm && npm exec --workspace accounts -- next dev --webpack -p 3001",
- "dev:albums": "npm run build:core-wasm && npm exec --workspace albums -- next dev --webpack -p 3002",
- "dev:auth": "npm run build:core-wasm && npm exec --workspace auth -- next dev --webpack -p 3003",
- "dev:cast": "npm run build:core-wasm && npm run build:cast-wasm && npm exec --workspace cast -- next dev --webpack -p 3004",
- "dev:embed": "npm run build:core-wasm && npm exec --workspace embed -- next dev --webpack -p 3006",
+ "dev:accounts": "npm run build:prelogin-wasm && npm exec --workspace accounts -- next dev --webpack -p 3001",
+ "dev:albums": "npm run build:prelogin-wasm && npm exec --workspace albums -- next dev --webpack -p 3002",
+ "dev:auth": "npm run build:prelogin-wasm && npm exec --workspace auth -- next dev --webpack -p 3003",
+ "dev:cast": "npm run build:prelogin-wasm && npm run build:cast-wasm && npm exec --workspace cast -- next dev --webpack -p 3004",
+ "dev:embed": "npm run build:prelogin-wasm && npm exec --workspace embed -- next dev --webpack -p 3006",
"dev:ensu": "npm run build:ensu-wasm && npm exec --workspace ensu -- next dev --webpack -p 3007",
"dev:legacy": "npm run build:legacy-wasm && npm exec --workspace legacy -- next dev --webpack -p 3011",
- "dev:locker": "npm run build:core-wasm && npm run build:legacy-wasm && npm run build:locker-wasm && npm exec --workspace locker -- next dev --webpack -p 3009",
- "dev:memories": "npm run build:core-wasm && npm exec --workspace memories -- next dev --webpack -p 3010",
+ "dev:locker": "npm run build:prelogin-wasm && npm run build:legacy-wasm && npm run build:locker-wasm && npm exec --workspace locker -- next dev --webpack -p 3009",
+ "dev:memories": "npm run build:prelogin-wasm && npm exec --workspace memories -- next dev --webpack -p 3010",
"dev:paste": "npm run build:paste-wasm && npm exec --workspace paste -- next dev --webpack -p 3008",
"dev:payments": "npm run dev --workspace payments",
- "dev:photos": "npm run build:core-wasm && npm run build:cast-wasm && npm run build:photos-wasm && npm exec --workspace photos -- next dev --webpack -p 3000",
- "dev:share": "npm run build:core-wasm && npm exec --workspace share -- next dev --webpack -p 3005",
- "dev:space": "npm run build:core-wasm && npm run build:space-wasm && npm exec --workspace space -- next dev --webpack -p 3013",
+ "dev:photos": "npm run build:prelogin-wasm && npm run build:cast-wasm && npm run build:photos-wasm && npm exec --workspace photos -- next dev --webpack -p 3000",
+ "dev:share": "npm run build:prelogin-wasm && npm exec --workspace share -- next dev --webpack -p 3005",
+ "dev:space": "npm run build:prelogin-wasm && npm run build:space-wasm && npm exec --workspace space -- next dev --webpack -p 3013",
"dev:twoof3": "npm exec --workspace twoof3 -- next dev --webpack -p 3012",
"lint": "concurrently --names 'prettier,eslint,tsc,wasm-imports' \"prettier --check --log-level warn .\" \"npm exec --workspaces -- eslint --max-warnings 0\" \"npm exec --workspaces -- tsc\" \"npm run check:wasm-imports\"",
"lint:fix": "concurrently --names 'prettier,eslint,tsc' \"prettier --write --log-level warn .\" \"npm exec --workspaces -- eslint --fix --max-warnings 0\" \"npm exec --workspaces -- tsc\"",
- "test": "npm run test --workspace ente-core-wasm && npm run test --workspace ente-locker-wasm && npm run test --workspace ente-paste-wasm && npm run test --workspace ente-contacts && npm run test --workspace locker && npm run test --workspace photos"
+ "test": "npm run test --workspace ente-prelogin-wasm && npm run test --workspace ente-locker-wasm && npm run test --workspace ente-paste-wasm && npm run test --workspace ente-contacts && npm run test --workspace locker && npm run test --workspace photos"
},
"overrides": {
"@types/react": "19.2.17",
diff --git a/web/packages/accounts/package.json b/web/packages/accounts/package.json
index 4dcaef7975..8386c6f00a 100644
--- a/web/packages/accounts/package.json
+++ b/web/packages/accounts/package.json
@@ -7,7 +7,7 @@
"@hugeicons/react": "1.1.6",
"comlink": "4.4.2",
"ente-base": "*",
- "ente-core-wasm": "*",
+ "ente-prelogin-wasm": "*",
"react": "19.2.7",
"react-dom": "19.2.7",
"uuid": "13.0.2",
diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx
index 42236fcb44..6ced1f13fb 100644
--- a/web/packages/accounts/pages/credentials.tsx
+++ b/web/packages/accounts/pages/credentials.tsx
@@ -26,12 +26,12 @@ import {
saveSRPAttributes,
updateSavedLocalUser,
} from "ente-accounts/services/accounts-db";
-import { masterKeyFromSession } from "ente-accounts/services/core-session";
import { decryptBox } from "ente-accounts/services/crypto";
import {
openPasskeyVerificationURL,
passkeyVerificationRedirectURL,
} from "ente-accounts/services/passkey";
+import { masterKeyFromSession } from "ente-accounts/services/prelogin-session";
import {
appHomeRoute,
stashRedirect,
diff --git a/web/packages/accounts/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.ts
index 69bc497245..dfc7a9ab14 100644
--- a/web/packages/accounts/services/crypto/index.ts
+++ b/web/packages/accounts/services/crypto/index.ts
@@ -13,8 +13,11 @@ export {
generateKeyPair,
generateSRPSetup,
recoveryKeyFromMnemonicOrHex,
-} from "ente-core-wasm";
-export type { EncryptedBoxB64 as EncryptedBox, KeyPair } from "ente-core-wasm";
+} from "ente-prelogin-wasm";
+export type {
+ EncryptedBoxB64 as EncryptedBox,
+ KeyPair,
+} from "ente-prelogin-wasm";
export type { DerivedKey } from "./kdf";
diff --git a/web/packages/accounts/services/crypto/kdf.ts b/web/packages/accounts/services/crypto/kdf.ts
index af4bbc395a..6b8f6b4110 100644
--- a/web/packages/accounts/services/crypto/kdf.ts
+++ b/web/packages/accounts/services/crypto/kdf.ts
@@ -2,5 +2,5 @@ export {
deriveInteractiveKey,
deriveKey,
deriveSensitiveKey,
-} from "ente-core-wasm";
-export type { DerivedKey } from "ente-core-wasm";
+} from "ente-prelogin-wasm";
+export type { DerivedKey } from "ente-prelogin-wasm";
diff --git a/web/packages/accounts/services/core-session.ts b/web/packages/accounts/services/prelogin-session.ts
similarity index 87%
rename from web/packages/accounts/services/core-session.ts
rename to web/packages/accounts/services/prelogin-session.ts
index 86a9bc3d5c..3bcefe2723 100644
--- a/web/packages/accounts/services/core-session.ts
+++ b/web/packages/accounts/services/prelogin-session.ts
@@ -1,4 +1,4 @@
-import { decryptBox } from "ente-core-wasm";
+import { decryptBox } from "ente-prelogin-wasm";
import {
masterKeyFromSession as readMasterKeyFromSession,
ensureMasterKeyFromSession as readRequiredMasterKeyFromSession,
diff --git a/web/packages/accounts/services/recovery-key.ts b/web/packages/accounts/services/recovery-key.ts
index 644a43f57e..38873edebe 100644
--- a/web/packages/accounts/services/recovery-key.ts
+++ b/web/packages/accounts/services/recovery-key.ts
@@ -1,15 +1,15 @@
import { savedKeyAttributes } from "ente-accounts/services/accounts-db";
-import { ensureMasterKeyFromSession } from "ente-accounts/services/core-session";
import {
decryptBox,
encryptBox,
generateKey,
recoveryKeyFromMnemonicOrHex,
} from "ente-accounts/services/crypto";
+import { ensureMasterKeyFromSession } from "ente-accounts/services/prelogin-session";
import { saveKeyAttributes } from "./accounts-db";
import { putUserRecoveryKeyAttributes, type KeyAttributes } from "./user";
-export { recoveryKeyToMnemonic } from "ente-core-wasm";
+export { recoveryKeyToMnemonic } from "ente-prelogin-wasm";
// For legacy compatibility, the hex representation of the recovery key is
// accepted in addition to the 24 word BIP-39 mnemonic.
diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.ts
index c8cec611e7..a148fefff7 100644
--- a/web/packages/accounts/services/srp.ts
+++ b/web/packages/accounts/services/srp.ts
@@ -10,7 +10,7 @@ import {
publicRequestHeaders,
} from "ente-base/http";
import { apiURL } from "ente-base/origins";
-import { createSRPSession } from "ente-core-wasm";
+import { createSRPSession } from "ente-prelogin-wasm";
import { ensure } from "ente-utils/ensure";
import { v4 as uuidv4 } from "uuid";
import { z } from "zod";
@@ -87,15 +87,15 @@ const srpSetupOrReconfigure = async (
srpUserID,
srpSalt,
srpVerifier,
- srpA: session.public_a(),
+ srpA: session.publicA(),
});
const { srpM2 } = await exchangeCB({
setupID,
- srpM1: session.compute_m1(srpB),
+ srpM1: session.computeM1(srpB),
});
- session.verify_m2(srpM2);
+ session.verifyM2(srpM2);
};
interface SetupSRPRequest {
@@ -200,16 +200,16 @@ export const verifySRP = async (
const { srpB, sessionID } = await createSRPSessionOnRemote({
srpUserID,
- srpA: session.public_a(),
+ srpA: session.publicA(),
});
const { srpM2, ...rest } = await verifySRPSession({
sessionID,
srpUserID,
- srpM1: session.compute_m1(srpB),
+ srpM1: session.computeM1(srpB),
});
- session.verify_m2(srpM2);
+ session.verifyM2(srpM2);
return rest;
};
diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.ts
index 49c392e220..32d6e8aaeb 100644
--- a/web/packages/accounts/services/user.ts
+++ b/web/packages/accounts/services/user.ts
@@ -6,7 +6,6 @@ import {
saveKeyAttributes,
updateSavedLocalUser,
} from "ente-accounts/services/accounts-db";
-import { ensureMasterKeyFromSession } from "ente-accounts/services/core-session";
import {
boxSealOpenBytes,
decryptBox,
@@ -17,6 +16,7 @@ import {
generateKeyPair,
toB64URLSafe,
} from "ente-accounts/services/crypto";
+import { ensureMasterKeyFromSession } from "ente-accounts/services/prelogin-session";
import {
ensureMasterKeyFromSession as readMasterKeyFromSession,
type DecryptBox,
diff --git a/web/packages/base/next.config.base.js b/web/packages/base/next.config.base.js
index ed4d2c083d..fdd42b1fba 100644
--- a/web/packages/base/next.config.base.js
+++ b/web/packages/base/next.config.base.js
@@ -105,7 +105,7 @@ const nextConfig = {
"ente-base",
"ente-utils",
"ente-new",
- "ente-core-wasm",
+ "ente-prelogin-wasm",
"ente-paste-wasm",
],
diff --git a/web/packages/contacts/package.json b/web/packages/contacts/package.json
index fec3a6b157..5c05d13e6d 100644
--- a/web/packages/contacts/package.json
+++ b/web/packages/contacts/package.json
@@ -20,9 +20,9 @@
"devDependencies": {
"@types/react": "19.2.17",
"ente-build-config": "*",
- "ente-core-wasm": "*",
"ente-locker-wasm": "*",
"ente-photos-wasm": "*",
+ "ente-prelogin-wasm": "*",
"vite-plugin-wasm": "3.6.0",
"vitest": "4.1.8"
}
diff --git a/web/packages/contacts/wasm.test.ts b/web/packages/contacts/wasm.test.ts
index 89eda70c3e..5ca2a7c8f5 100644
--- a/web/packages/contacts/wasm.test.ts
+++ b/web/packages/contacts/wasm.test.ts
@@ -1,12 +1,12 @@
+import * as legacy from "ente-legacy-wasm/authenticated";
+import * as locker from "ente-locker-wasm";
+import * as photos from "ente-photos-wasm";
import {
boxSealOpen,
encryptBox,
generateKey,
generateKeyPair,
-} from "ente-core-wasm";
-import * as legacy from "ente-legacy-wasm/authenticated";
-import * as locker from "ente-locker-wasm";
-import * as photos from "ente-photos-wasm";
+} from "ente-prelogin-wasm";
import { afterEach, describe, expect, test, vi } from "vitest";
afterEach(() => vi.unstubAllGlobals());
diff --git a/web/packages/wasm/core/tsconfig.json b/web/packages/wasm/core/tsconfig.json
deleted file mode 100644
index 78accbc94f..0000000000
--- a/web/packages/wasm/core/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "extends": "ente-build-config/tsconfig-typecheck.json",
- "include": ["."],
- "exclude": ["space"]
-}
diff --git a/web/packages/wasm/core/eslint.config.mjs b/web/packages/wasm/prelogin/eslint.config.mjs
similarity index 100%
rename from web/packages/wasm/core/eslint.config.mjs
rename to web/packages/wasm/prelogin/eslint.config.mjs
diff --git a/web/packages/wasm/core/index.ts b/web/packages/wasm/prelogin/index.ts
similarity index 86%
rename from web/packages/wasm/core/index.ts
rename to web/packages/wasm/prelogin/index.ts
index 5c7647e005..d2e6077df4 100644
--- a/web/packages/wasm/core/index.ts
+++ b/web/packages/wasm/prelogin/index.ts
@@ -1,10 +1,10 @@
import { readAndFree } from "ente-utils/wasm";
-import type { SrpSession } from "./pkg/ente_core_wasm";
+import type { SrpSession } from "./pkg/ente_prelogin_wasm";
export type EncryptedBoxB64 = Awaited<ReturnType<typeof encryptBox>>;
export type KeyPair = Awaited<ReturnType<typeof generateKeyPair>>;
-const wasm = () => import("./pkg/ente_core_wasm");
+const wasm = () => import("./pkg/ente_prelogin_wasm");
type BytesOrB64 = Uint8Array | string;
@@ -31,13 +31,13 @@ export const deriveKey = async (
saltB64: string,
opsLimit: number,
memLimit: number,
-) => (await wasm()).auth_derive_kek(password, saltB64, memLimit, opsLimit);
+) => (await wasm()).authDeriveKek(password, saltB64, memLimit, opsLimit);
export const deriveSensitiveKey = async (
password: string,
): Promise<DerivedKey> =>
readAndFree(
- (await wasm()).auth_generate_sensitive_kek(password),
+ (await wasm()).authGenerateSensitiveKek(password),
derivedKeyValue,
);
@@ -54,19 +54,19 @@ export const generateSRPSetup = async (
srpUserID: string,
): Promise<SRPSetupAttributes> =>
readAndFree(
- (await wasm()).auth_generate_srp_setup(kekB64, srpUserID),
+ (await wasm()).authGenerateSrpSetup(kekB64, srpUserID),
(setup) => ({
- srpSalt: setup.srp_salt,
- srpVerifier: setup.srp_verifier,
- loginSubKey: setup.login_sub_key,
+ srpSalt: setup.srpSalt,
+ srpVerifier: setup.srpVerifier,
+ loginSubKey: setup.loginSubKey,
}),
);
export const recoveryKeyFromMnemonicOrHex = async (value: string) =>
- (await wasm()).auth_recovery_key_from_mnemonic_or_hex(value);
+ (await wasm()).authRecoveryKeyFromMnemonicOrHex(value);
export const recoveryKeyToMnemonic = async (recoveryKeyB64: string) =>
- (await wasm()).auth_recovery_key_to_mnemonic(recoveryKeyB64);
+ (await wasm()).authRecoveryKeyToMnemonic(recoveryKeyB64);
export const createSRPSession = async (
srpSaltB64: string,
diff --git a/web/packages/wasm/core/package.json b/web/packages/wasm/prelogin/package.json
similarity index 81%
rename from web/packages/wasm/core/package.json
rename to web/packages/wasm/prelogin/package.json
index ae8a82866c..41d6e32f19 100644
--- a/web/packages/wasm/core/package.json
+++ b/web/packages/wasm/prelogin/package.json
@@ -1,5 +1,5 @@
{
- "name": "ente-core-wasm",
+ "name": "ente-prelogin-wasm",
"version": "0.0.0",
"private": true,
"exports": {
@@ -11,7 +11,7 @@
"module": "./index.ts",
"types": "./index.ts",
"scripts": {
- "build": "wasm-pack build ../../../../rust/bindings/wasm/core-wasm --target bundler --out-dir ../../../../web/packages/wasm/core/pkg --no-pack",
+ "build": "wasm-pack build ../../../../rust/bindings/wasm/prelogin --target bundler --out-dir ../../../../web/packages/wasm/prelogin/pkg --no-pack",
"test": "vitest --run"
},
"dependencies": {
diff --git a/web/packages/wasm/core/tests/auth.test.ts b/web/packages/wasm/prelogin/tests/auth.test.ts
similarity index 60%
rename from web/packages/wasm/core/tests/auth.test.ts
rename to web/packages/wasm/prelogin/tests/auth.test.ts
index 03724b433c..1bb2cad095 100644
--- a/web/packages/wasm/core/tests/auth.test.ts
+++ b/web/packages/wasm/prelogin/tests/auth.test.ts
@@ -1,9 +1,9 @@
import { expect, test } from "vitest";
import {
authGenerateInteractiveKek,
- auth_generate_srp_setup,
+ authGenerateSrpSetup,
cryptoGenerateKey,
-} from "../pkg/ente_core_wasm.js";
+} from "../pkg/ente_prelogin_wasm.js";
test("generates an interactive kek bundle", () => {
const generated = authGenerateInteractiveKek(
@@ -18,11 +18,11 @@ test("generates an interactive kek bundle", () => {
test("generates SRP setup attributes from a kek", () => {
const kek = cryptoGenerateKey();
- const generated = auth_generate_srp_setup(kek, "test-user-id");
+ const generated = authGenerateSrpSetup(kek, "test-user-id");
- expect(Buffer.from(generated.srp_salt, "base64")).toHaveLength(16);
- expect(Buffer.from(generated.login_sub_key, "base64")).toHaveLength(16);
- expect(
- Buffer.from(generated.srp_verifier, "base64").length,
- ).toBeGreaterThan(0);
+ expect(Buffer.from(generated.srpSalt, "base64")).toHaveLength(16);
+ expect(Buffer.from(generated.loginSubKey, "base64")).toHaveLength(16);
+ expect(Buffer.from(generated.srpVerifier, "base64").length).toBeGreaterThan(
+ 0,
+ );
});
diff --git a/web/packages/wasm/prelogin/tsconfig.json b/web/packages/wasm/prelogin/tsconfig.json
new file mode 100644
index 0000000000..3f3b6cd165
--- /dev/null
+++ b/web/packages/wasm/prelogin/tsconfig.json
@@ -0,0 +1 @@
+{ "extends": "ente-build-config/tsconfig-typecheck.json", "include": ["."] }
diff --git a/web/packages/wasm/core/vitest.config.ts b/web/packages/wasm/prelogin/vitest.config.ts
similarity index 100%
rename from web/packages/wasm/core/vitest.config.ts
rename to web/packages/wasm/prelogin/vitest.config.ts