Skip to content

armgit / ente

Public Imported from GitHub
0

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

Move Paste web logic to Rust

Manav Rathi1dfe14b1b59b
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 63257d63c4..9e4eb7c021 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,7 +6,7 @@ updates:
- "/web"
- "/web/apps/*"
- "/web/packages/*"
- - "/web/packages/wasm/space"
+ - "/web/packages/wasm/*"
schedule:
interval: "weekly"
open-pull-requests-limit: 0
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
index a54b446a5a..dcf62edb9d 100644
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@@ -4,10 +4,9 @@ on:
pull_request:
paths:
- "web/**"
- - "rust/bindings/wasm/cast/**"
- - "rust/bindings/wasm/ente-wasm/**"
- - "rust/bindings/wasm/space/**"
+ - "rust/bindings/wasm/**"
- "rust/crates/cast/**"
+ - "rust/crates/paste/**"
- "rust/crates/space/**"
- "rust/crates/contacts/**"
- "rust/crates/core/**"
@@ -55,6 +54,8 @@ jobs:
- run: npm run build:cast-wasm
+ - run: npm run build:paste-wasm
+
- run: npm run build:space-wasm
- run: npm run lint
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index cdc76ff9fa..82018edaa4 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2487,6 +2487,22 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "ente-core-wasm"
+version = "0.0.0"
+dependencies = [
+ "ente-accounts",
+ "ente-contacts",
+ "ente-core",
+ "ente-wasm-log",
+ "js-sys",
+ "md-5 0.11.0",
+ "serde",
+ "serde-wasm-bindgen",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
[[package]]
name = "ente-ensu"
version = "0.0.0"
@@ -2605,6 +2621,17 @@ dependencies = [
"url",
]
+[[package]]
+name = "ente-paste-wasm"
+version = "0.0.0"
+dependencies = [
+ "ente-paste",
+ "ente-wasm-log",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
[[package]]
name = "ente-photos"
version = "0.0.0"
@@ -2726,31 +2753,6 @@ dependencies = [
"log",
]
-[[package]]
-name = "ente-wasm"
-version = "0.0.0"
-dependencies = [
- "ente-accounts",
- "ente-contacts",
- "ente-core",
- "ente-wasm-log",
- "js-sys",
- "md-5 0.11.0",
- "serde",
- "serde-wasm-bindgen",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "ente-wasm-core"
-version = "0.0.0"
-dependencies = [
- "ente-core",
- "ente-wasm-log",
- "wasm-bindgen",
-]
-
[[package]]
name = "ente-wasm-log"
version = "0.0.0"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index fed3d976e4..b9a6889352 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -12,9 +12,9 @@ members = [
"bindings/uniffi/ensu",
"bindings/uniffi/log",
"bindings/wasm/cast",
- "bindings/wasm/ente-wasm",
"bindings/wasm/core",
"bindings/wasm/log",
+ "bindings/wasm/paste",
"bindings/wasm/space",
"crates/accounts",
"crates/assets",
@@ -48,6 +48,7 @@ ente-uniffi-log = { path = "bindings/uniffi/log" }
ente-wasm-log = { path = "bindings/wasm/log" }
flutter_rust_bridge = "=2.12.0"
flutter_rust_bridge_codegen = "=2.12.0"
+js-sys = "0.3.102"
log = "0.4.29"
md-5 = "0.11.0"
mockito = "1.7.2"
@@ -56,6 +57,7 @@ ort-sys = { version = "=2.0.0-rc.13", default-features = false }
reqwest = { version = "0.12.28", default-features = false }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
+serde-wasm-bindgen = "0.6.5"
sha2 = "0.11.0"
thiserror = "2.0.18"
uniffi = { version = "=0.31.0" }
@@ -63,6 +65,7 @@ uniffi_bindgen = { version = "=0.31.0", default-features = false, features = ["c
url = "2.5.8"
urlencoding = "2.1.3"
wasm-bindgen = "0.2.125"
+wasm-bindgen-futures = "0.4.75"
zeroize = { version = "1.8.2", features = ["derive"] }
# Unoptimized Argon2 makes production-strength derivations dominate test runtime.
diff --git a/rust/apps/cli/src/commands/paste.rs b/rust/apps/cli/src/commands/paste.rs
index c386c09391..b20fab76d3 100644
--- a/rust/apps/cli/src/commands/paste.rs
+++ b/rust/apps/cli/src/commands/paste.rs
@@ -176,17 +176,7 @@ fn read_paste_text(text: Option<String>, file: Option<PathBuf>) -> Result<String
(Some(_), Some(_)) => unreachable!("clap prevents text and --file together"),
};
- if text.trim().is_empty() {
- return Err(Error::InvalidInput(
- "Paste text cannot be empty".to_string(),
- ));
- }
- if text.chars().count() > ente_paste::MAX_PASTE_CHARS {
- return Err(Error::InvalidInput(format!(
- "Paste is limited to {} characters",
- ente_paste::MAX_PASTE_CHARS
- )));
- }
+ ente_paste::validate_text(&text)?;
Ok(text)
}
diff --git a/rust/apps/cli/src/models/error.rs b/rust/apps/cli/src/models/error.rs
index 5f97823d49..cc0e4d128d 100644
--- a/rust/apps/cli/src/models/error.rs
+++ b/rust/apps/cli/src/models/error.rs
@@ -55,7 +55,27 @@ impl From<ente_paste::Error> for Error {
E::IncorrectPassword => {
Error::AuthenticationFailed("Incorrect paste password".to_string())
}
- E::InvalidInput(message) => Error::InvalidInput(message),
+ E::Unavailable => {
+ Error::Generic("This paste has expired or was already opened.".to_string())
+ }
+ E::EmptyText => Error::InvalidInput("Paste text cannot be empty".to_string()),
+ E::TextTooLong => Error::InvalidInput(format!(
+ "Paste is limited to {} characters",
+ ente_paste::MAX_PASTE_CHARS
+ )),
+ E::InvalidLink => {
+ Error::InvalidInput("Paste URL or access token is invalid".to_string())
+ }
+ E::InvalidAccessToken => Error::InvalidInput("Invalid paste access token".to_string()),
+ E::InvalidKey => Error::InvalidInput("Invalid paste key".to_string()),
+ E::MissingKey => {
+ Error::InvalidInput("Paste key missing. Pass a full paste URL or --key".to_string())
+ }
+ E::KeyMismatch => {
+ Error::InvalidInput("Paste URL fragment and --key do not match".to_string())
+ }
+ E::PasswordRequired => Error::InvalidInput("Paste password is required".to_string()),
+ E::SessionNotOpen => Error::Generic("Paste is not open".to_string()),
other => Error::Generic(other.to_string()),
}
}
diff --git a/rust/apps/cli/tests/paste.rs b/rust/apps/cli/tests/paste.rs
index 69dbc1969a..bd7fe54b66 100644
--- a/rust/apps/cli/tests/paste.rs
+++ b/rust/apps/cli/tests/paste.rs
@@ -48,8 +48,9 @@ fn full_link_roundtrip(museum: &Museum) -> TestResult {
String::from_utf8_lossy(&second_consume.stdout),
);
assert!(
- String::from_utf8_lossy(&second_consume.stderr).contains("HTTP 410"),
- "second consume should fail with 410, got stderr: {}",
+ String::from_utf8_lossy(&second_consume.stderr)
+ .contains("This paste has expired or was already opened."),
+ "second consume should report the paste as unavailable, got stderr: {}",
String::from_utf8_lossy(&second_consume.stderr),
);
@@ -173,8 +174,9 @@ fn wrong_password_consumes_password_protected_paste(museum: &Museum) -> TestResu
String::from_utf8_lossy(&second.stdout),
);
assert!(
- String::from_utf8_lossy(&second.stderr).contains("HTTP 410"),
- "second consume should fail with 410, got stderr: {}",
+ String::from_utf8_lossy(&second.stderr)
+ .contains("This paste has expired or was already opened."),
+ "second consume should report the paste as unavailable, got stderr: {}",
String::from_utf8_lossy(&second.stderr),
);
@@ -216,7 +218,8 @@ fn consumed_password_paste_checks_availability_before_password(museum: &Museum)
"second consume unexpectedly succeeded"
);
assert!(
- String::from_utf8_lossy(&second.stderr).contains("HTTP 410"),
+ String::from_utf8_lossy(&second.stderr)
+ .contains("This paste has expired or was already opened."),
"consumed paste should fail before password validation, got stderr: {}",
String::from_utf8_lossy(&second.stderr),
);
diff --git a/rust/bindings/wasm/core/Cargo.toml b/rust/bindings/wasm/core/Cargo.toml
index 21ed1fdacb..607e8d8010 100644
--- a/rust/bindings/wasm/core/Cargo.toml
+++ b/rust/bindings/wasm/core/Cargo.toml
@@ -1,11 +1,18 @@
[package]
-name = "ente-wasm-core"
+name = "ente-core-wasm"
edition = "2024"
[lib]
crate-type = ["cdylib"]
[dependencies]
-ente-core = { workspace = true }
+ente-accounts.workspace = true
+ente-contacts.workspace = true
+ente-core.workspace = true
ente-wasm-log.workspace = true
+js-sys.workspace = true
+md-5.workspace = true
+serde.workspace = true
+serde-wasm-bindgen.workspace = true
wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
diff --git a/rust/bindings/wasm/ente-wasm/src/auth.rs b/rust/bindings/wasm/core/src/auth.rs
similarity index 100%
rename from rust/bindings/wasm/ente-wasm/src/auth.rs
rename to rust/bindings/wasm/core/src/auth.rs
diff --git a/rust/bindings/wasm/ente-wasm/src/contacts.rs b/rust/bindings/wasm/core/src/contacts.rs
similarity index 100%
rename from rust/bindings/wasm/ente-wasm/src/contacts.rs
rename to rust/bindings/wasm/core/src/contacts.rs
diff --git a/rust/bindings/wasm/ente-wasm/src/crypto.rs b/rust/bindings/wasm/core/src/crypto.rs
similarity index 100%
rename from rust/bindings/wasm/ente-wasm/src/crypto.rs
rename to rust/bindings/wasm/core/src/crypto.rs
diff --git a/rust/bindings/wasm/core/src/crypto/blob.rs b/rust/bindings/wasm/core/src/crypto/blob.rs
deleted file mode 100644
index ea722b8273..0000000000
--- a/rust/bindings/wasm/core/src/crypto/blob.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use ente_core::crypto as core_crypto;
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen]
-pub struct EncryptedBlob {
- encrypted_data: Vec<u8>,
- decryption_header: Vec<u8>,
-}
-
-#[wasm_bindgen]
-impl EncryptedBlob {
- #[wasm_bindgen(getter, js_name = encryptedData)]
- pub fn encrypted_data(&self) -> Vec<u8> {
- self.encrypted_data.clone()
- }
-
- #[wasm_bindgen(getter, js_name = decryptionHeader)]
- pub fn decryption_header(&self) -> Vec<u8> {
- self.decryption_header.clone()
- }
-}
-
-#[wasm_bindgen(js_name = blobEncrypt)]
-pub fn blob_encrypt(data: &[u8], key: &[u8]) -> Result<EncryptedBlob, JsError> {
- let out = core_crypto::blob::encrypt(data, &core_crypto::Key::try_from_slice(key)?)?;
- Ok(EncryptedBlob {
- encrypted_data: out.encrypted_data,
- decryption_header: out.decryption_header.as_bytes().to_vec(),
- })
-}
-
-#[wasm_bindgen(js_name = blobDecrypt)]
-pub fn blob_decrypt(data: &[u8], header: &[u8], key: &[u8]) -> Result<Vec<u8>, JsError> {
- Ok(core_crypto::blob::decrypt(
- data,
- &core_crypto::Header::try_from_slice(header)?,
- &core_crypto::Key::try_from_slice(key)?,
- )?)
-}
-
-#[wasm_bindgen(js_name = blobEncryptCombined)]
-pub fn blob_encrypt_combined(data: &[u8], key: &[u8]) -> Result<Vec<u8>, JsError> {
- Ok(core_crypto::blob::encrypt_combined(
- data,
- &core_crypto::Key::try_from_slice(key)?,
- )?)
-}
-
-#[wasm_bindgen(js_name = blobDecryptCombined)]
-pub fn blob_decrypt_combined(data: &[u8], key: &[u8]) -> Result<Vec<u8>, JsError> {
- Ok(core_crypto::blob::decrypt_combined(
- data,
- &core_crypto::Key::try_from_slice(key)?,
- )?)
-}
diff --git a/rust/bindings/wasm/core/src/crypto/mod.rs b/rust/bindings/wasm/core/src/crypto/mod.rs
deleted file mode 100644
index f7b08185bd..0000000000
--- a/rust/bindings/wasm/core/src/crypto/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod blob;
-mod secretbox;
diff --git a/rust/bindings/wasm/core/src/crypto/secretbox.rs b/rust/bindings/wasm/core/src/crypto/secretbox.rs
deleted file mode 100644
index b2d02e45c2..0000000000
--- a/rust/bindings/wasm/core/src/crypto/secretbox.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use ente_core::crypto as core_crypto;
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen]
-pub struct EncryptedBox {
- encrypted_data: Vec<u8>,
- nonce: Vec<u8>,
-}
-
-#[wasm_bindgen]
-impl EncryptedBox {
- #[wasm_bindgen(getter, js_name = encryptedData)]
- pub fn encrypted_data(&self) -> Vec<u8> {
- self.encrypted_data.clone()
- }
-
- #[wasm_bindgen(getter)]
- pub fn nonce(&self) -> Vec<u8> {
- self.nonce.clone()
- }
-}
-
-#[wasm_bindgen(js_name = secretboxEncrypt)]
-pub fn secretbox_encrypt(data: &[u8], key: &[u8]) -> Result<EncryptedBox, JsError> {
- let out = core_crypto::secretbox::encrypt(data, &core_crypto::Key::try_from_slice(key)?);
- Ok(EncryptedBox {
- encrypted_data: out.encrypted_data,
- nonce: out.nonce.as_bytes().to_vec(),
- })
-}
-
-#[wasm_bindgen(js_name = secretboxDecrypt)]
-pub fn secretbox_decrypt(data: &[u8], nonce: &[u8], key: &[u8]) -> Result<Vec<u8>, JsError> {
- Ok(core_crypto::secretbox::decrypt(
- data,
- &core_crypto::Nonce::try_from_slice(nonce)?,
- &core_crypto::Key::try_from_slice(key)?,
- )?)
-}
-
-#[wasm_bindgen(js_name = secretboxEncryptCombined)]
-pub fn secretbox_encrypt_combined(data: &[u8], key: &[u8]) -> Result<Vec<u8>, JsError> {
- Ok(core_crypto::secretbox::encrypt_combined(
- data,
- &core_crypto::Key::try_from_slice(key)?,
- ))
-}
-
-#[wasm_bindgen(js_name = secretboxDecryptCombined)]
-pub fn secretbox_decrypt_combined(data: &[u8], key: &[u8]) -> Result<Vec<u8>, JsError> {
- Ok(core_crypto::secretbox::decrypt_combined(
- data,
- &core_crypto::Key::try_from_slice(key)?,
- )?)
-}
diff --git a/rust/bindings/wasm/ente-wasm/src/legacy_kit.rs b/rust/bindings/wasm/core/src/legacy_kit.rs
similarity index 100%
rename from rust/bindings/wasm/ente-wasm/src/legacy_kit.rs
rename to rust/bindings/wasm/core/src/legacy_kit.rs
diff --git a/rust/bindings/wasm/core/src/lib.rs b/rust/bindings/wasm/core/src/lib.rs
index f1dc08c05f..34ccaa393f 100644
--- a/rust/bindings/wasm/core/src/lib.rs
+++ b/rust/bindings/wasm/core/src/lib.rs
@@ -1,3 +1,7 @@
use ente_wasm_log as _;
+mod auth;
+mod contacts;
mod crypto;
+mod legacy_kit;
+mod urls;
diff --git a/rust/bindings/wasm/ente-wasm/src/urls.rs b/rust/bindings/wasm/core/src/urls.rs
similarity index 100%
rename from rust/bindings/wasm/ente-wasm/src/urls.rs
rename to rust/bindings/wasm/core/src/urls.rs
diff --git a/rust/bindings/wasm/ente-wasm/Cargo.toml b/rust/bindings/wasm/ente-wasm/Cargo.toml
deleted file mode 100644
index f0f35e93c7..0000000000
--- a/rust/bindings/wasm/ente-wasm/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "ente-wasm"
-edition = "2024"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-ente-accounts.workspace = true
-ente-contacts.workspace = true
-ente-core.workspace = true
-ente-wasm-log.workspace = true
-js-sys = "0.3"
-md-5.workspace = true
-serde.workspace = true
-serde-wasm-bindgen = "0.6"
-wasm-bindgen.workspace = true
-wasm-bindgen-futures = "0.4"
diff --git a/rust/bindings/wasm/ente-wasm/src/lib.rs b/rust/bindings/wasm/ente-wasm/src/lib.rs
deleted file mode 100644
index 34ccaa393f..0000000000
--- a/rust/bindings/wasm/ente-wasm/src/lib.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use ente_wasm_log as _;
-
-mod auth;
-mod contacts;
-mod crypto;
-mod legacy_kit;
-mod urls;
diff --git a/rust/bindings/wasm/log/Cargo.toml b/rust/bindings/wasm/log/Cargo.toml
index 2f28bfe2ef..2581e5374e 100644
--- a/rust/bindings/wasm/log/Cargo.toml
+++ b/rust/bindings/wasm/log/Cargo.toml
@@ -3,7 +3,7 @@ name = "ente-wasm-log"
edition = "2024"
[dependencies]
-js-sys = "0.3"
+js-sys.workspace = true
log.workspace = true
wasm-bindgen.workspace = true
web-sys = { version = "0.3.102", features = ["console"] }
diff --git a/rust/bindings/wasm/paste/Cargo.toml b/rust/bindings/wasm/paste/Cargo.toml
new file mode 100644
index 0000000000..18813559ae
--- /dev/null
+++ b/rust/bindings/wasm/paste/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "ente-paste-wasm"
+edition = "2024"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+ente-wasm-log.workspace = true
+ente-paste.workspace = true
+js-sys.workspace = true
+wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
diff --git a/rust/bindings/wasm/paste/src/lib.rs b/rust/bindings/wasm/paste/src/lib.rs
new file mode 100644
index 0000000000..1ff9c83ff6
--- /dev/null
+++ b/rust/bindings/wasm/paste/src/lib.rs
@@ -0,0 +1,113 @@
+use ente_paste::{Client, OpenPaste, PasteSession};
+use ente_wasm_log as _;
+use wasm_bindgen::prelude::*;
+
+pub struct PasteError(ente_paste::Error);
+
+impl From<ente_paste::Error> for PasteError {
+ fn from(error: ente_paste::Error) -> Self {
+ Self(error)
+ }
+}
+
+impl From<PasteError> for JsValue {
+ fn from(error: PasteError) -> Self {
+ let js_error = js_sys::Error::new(&error.0.to_string());
+ js_error.set_name(error.0.code());
+ js_error.into()
+ }
+}
+
+#[wasm_bindgen]
+pub struct CreatedPaste {
+ url: String,
+ password_required: bool,
+}
+
+#[wasm_bindgen]
+impl CreatedPaste {
+ #[wasm_bindgen(getter)]
+ pub fn url(&self) -> String {
+ self.url.clone()
+ }
+
+ #[wasm_bindgen(getter, js_name = passwordRequired)]
+ pub fn password_required(&self) -> bool {
+ self.password_required
+ }
+}
+
+#[wasm_bindgen]
+pub struct OpenedPaste {
+ password_required: bool,
+ text: Option<String>,
+}
+
+#[wasm_bindgen]
+impl OpenedPaste {
+ #[wasm_bindgen(getter, js_name = passwordRequired)]
+ pub fn password_required(&self) -> bool {
+ self.password_required
+ }
+
+ #[wasm_bindgen(getter)]
+ pub fn text(&self) -> Option<String> {
+ self.text.clone()
+ }
+}
+
+#[wasm_bindgen]
+pub struct PasteClient {
+ client: Client,
+ session: Option<PasteSession>,
+}
+
+#[wasm_bindgen]
+impl PasteClient {
+ #[wasm_bindgen(constructor)]
+ pub fn new(api_origin: String) -> Result<Self, PasteError> {
+ Ok(Self {
+ client: Client::new(api_origin, None)?,
+ session: None,
+ })
+ }
+
+ pub async fn create(
+ &self,
+ paste_origin: &str,
+ text: &str,
+ password: Option<String>,
+ ) -> Result<CreatedPaste, PasteError> {
+ let link = self.client.create(text, password.as_deref()).await?;
+ Ok(CreatedPaste {
+ url: link.url(paste_origin),
+ password_required: link.password_required(),
+ })
+ }
+
+ pub async fn open(&mut self, url: &str) -> Result<OpenedPaste, PasteError> {
+ let mut session = PasteSession::parse(url)?;
+ let opened = match session.open(&self.client).await? {
+ OpenPaste::PasswordRequired => OpenedPaste {
+ password_required: true,
+ text: None,
+ },
+ OpenPaste::Text(text) => OpenedPaste {
+ password_required: false,
+ text: Some(text),
+ },
+ };
+ self.session = Some(session);
+ Ok(opened)
+ }
+
+ #[wasm_bindgen(js_name = submitPassword)]
+ pub async fn submit_password(&mut self, password: &str) -> Result<String, PasteError> {
+ self.session
+ .as_mut()
+ .ok_or(ente_paste::Error::SessionNotOpen)?
+ .consume(&self.client, Some(password))
+ .await
+ .map_err(Into::into)
+ }
+}
diff --git a/rust/bindings/wasm/space/Cargo.toml b/rust/bindings/wasm/space/Cargo.toml
index 5ece705833..41d33fe308 100644
--- a/rust/bindings/wasm/space/Cargo.toml
+++ b/rust/bindings/wasm/space/Cargo.toml
@@ -11,9 +11,9 @@ ente-space.workspace = true
ente-wasm-log.workspace = true
log.workspace = true
serde.workspace = true
-serde-wasm-bindgen = "0.6"
+serde-wasm-bindgen.workspace = true
wasm-bindgen.workspace = true
-wasm-bindgen-futures = "0.4"
+wasm-bindgen-futures.workspace = true
[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt"] }
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rs
index 109c3b5910..16fe65eeb2 100644
--- a/rust/bindings/wasm/space/src/space.rs
+++ b/rust/bindings/wasm/space/src/space.rs
@@ -291,6 +291,23 @@ fn decode_b64_field(value: &str) -> Result<Vec<u8>, WasmSpaceError> {
.map_err(Into::into)
}
+#[wasm_bindgen(js_name = encryptSpaceRootEntityKey)]
+pub fn encrypt_space_root_entity_key(
+ space_root_key_b64: &str,
+ master_key_b64: &str,
+) -> Result<String, WasmSpaceError> {
+ ente_space::encrypt_space_root_entity_key(space_root_key_b64, master_key_b64)
+ .map_err(Into::into)
+}
+
+#[wasm_bindgen(js_name = decryptSpaceRootEntityKey)]
+pub fn decrypt_space_root_entity_key(
+ encrypted_key_b64: &str,
+ master_key_b64: &str,
+) -> Result<String, WasmSpaceError> {
+ ente_space::decrypt_space_root_entity_key(encrypted_key_b64, master_key_b64).map_err(Into::into)
+}
+
fn utf8_field(bytes: Vec<u8>, field: &str) -> Result<String, WasmSpaceError> {
String::from_utf8(bytes).map_err(|err| {
ente_space::SpaceError::InvalidInput(format!("invalid {field} utf8: {err}")).into()
diff --git a/rust/crates/core/src/http.rs b/rust/crates/core/src/http.rs
index e7972fd1fe..ecf2480f9e 100644
--- a/rust/crates/core/src/http.rs
+++ b/rust/crates/core/src/http.rs
@@ -310,6 +310,11 @@ impl RequestBuilder {
Self(self.0.body(body))
}
+ #[cfg(target_arch = "wasm32")]
+ pub fn credentials_include(self) -> Self {
+ Self(self.0.fetch_credentials_include())
+ }
+
pub async fn send(self) -> Result<Response, Error> {
Ok(Response(self.0.send().await?))
}
diff --git a/rust/crates/paste/src/lib.rs b/rust/crates/paste/src/lib.rs
index 202ab7e2da..862c720257 100644
--- a/rust/crates/paste/src/lib.rs
+++ b/rust/crates/paste/src/lib.rs
@@ -8,6 +8,7 @@ pub const MAX_PASTE_CHARS: usize = 4000;
const FRAGMENT_SECRET_LENGTH: usize = 12;
const FRAGMENT_SECRET_ALPHABET: &[u8] =
b"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+#[cfg(not(target_arch = "wasm32"))]
const PASTE_GUARD_COOKIE: &str = "paste_guard";
const PASSWORD_FRAGMENT_PREFIX: &str = "p-";
const PASSWORD_KDF_CONTEXT: &str = "ente-paste-password-v1";
@@ -26,8 +27,35 @@ pub enum Error {
#[error("incorrect paste password")]
IncorrectPassword,
- #[error("invalid input: {0}")]
- InvalidInput(String),
+ #[error("paste is unavailable")]
+ Unavailable,
+
+ #[error("paste text is empty")]
+ EmptyText,
+
+ #[error("paste text exceeds the maximum length")]
+ TextTooLong,
+
+ #[error("paste URL or access token is invalid")]
+ InvalidLink,
+
+ #[error("paste access token is invalid")]
+ InvalidAccessToken,
+
+ #[error("paste key is invalid")]
+ InvalidKey,
+
+ #[error("paste key is missing")]
+ MissingKey,
+
+ #[error("paste keys do not match")]
+ KeyMismatch,
+
+ #[error("paste password is required")]
+ PasswordRequired,
+
+ #[error("paste session is not open")]
+ SessionNotOpen,
#[error("the paste data is malformed or corrupted")]
MalformedPayload,
@@ -38,6 +66,29 @@ pub enum Error {
pub type Result<T> = std::result::Result<T, Error>;
+impl Error {
+ pub fn code(&self) -> &'static str {
+ match self {
+ Self::Http(http::Error::Network(_)) => "network",
+ Self::Http(_) => "request_failed",
+ Self::Crypto(_) => "crypto",
+ Self::Base64Decode(_) | Self::MalformedPayload => "malformed_payload",
+ Self::IncorrectPassword => "incorrect_password",
+ Self::Unavailable => "unavailable",
+ Self::EmptyText => "empty_text",
+ Self::TextTooLong => "text_too_long",
+ Self::InvalidLink => "invalid_link",
+ Self::InvalidAccessToken => "invalid_access_token",
+ Self::InvalidKey => "invalid_key",
+ Self::MissingKey => "missing_key",
+ Self::KeyMismatch => "key_mismatch",
+ Self::PasswordRequired => "password_required",
+ Self::SessionNotOpen => "session_not_open",
+ Self::MissingGuardCookie => "missing_guard_cookie",
+ }
+ }
+}
+
#[derive(Debug, Eq, PartialEq)]
pub struct PasteKey {
fragment_secret: String,
@@ -70,7 +121,7 @@ impl PasteKey {
if self.password_required {
let password = password
.filter(|password| !password.is_empty())
- .ok_or_else(|| Error::InvalidInput("Paste password is required".to_string()))?;
+ .ok_or(Error::PasswordRequired)?;
Ok(format!(
"{PASSWORD_KDF_CONTEXT}\n{}\n{password}",
self.fragment_secret
@@ -90,7 +141,7 @@ fn validate_fragment_secret(fragment_secret: &str) -> Result<()> {
return Ok(());
}
- Err(Error::InvalidInput("Invalid paste key".to_string()))
+ Err(Error::InvalidKey)
}
#[derive(Debug)]
@@ -103,9 +154,7 @@ impl PasteLink {
pub fn parse(input: &str, key: Option<&str>) -> Result<Self> {
let input = input.trim();
if input.is_empty() {
- return Err(Error::InvalidInput(
- "Paste URL or access token is empty".to_string(),
- ));
+ return Err(Error::InvalidLink);
}
let (access_token, embedded_secret) = match url::Url::parse(input) {
@@ -113,9 +162,7 @@ impl PasteLink {
let token = url
.path_segments()
.and_then(|mut segments| segments.rfind(|segment| !segment.is_empty()))
- .ok_or_else(|| {
- Error::InvalidInput("Paste URL is missing an access token".into())
- })?;
+ .ok_or(Error::InvalidLink)?;
(token.to_string(), url.fragment().map(str::to_string))
}
Err(_) => match input.split_once('#') {
@@ -127,24 +174,17 @@ impl PasteLink {
};
if access_token.trim().is_empty() {
- return Err(Error::InvalidInput(
- "Paste access token is empty".to_string(),
- ));
+ return Err(Error::InvalidAccessToken);
}
+ validate_access_token(&access_token)?;
let key = match (embedded_secret, key) {
(Some(embedded), Some(key)) if embedded != key => {
- return Err(Error::InvalidInput(
- "Paste URL fragment and --key do not match".to_string(),
- ));
+ return Err(Error::KeyMismatch);
}
(Some(embedded), _) => PasteKey::parse(&embedded)?,
(None, Some(key)) => PasteKey::parse(key)?,
- (None, None) => {
- return Err(Error::InvalidInput(
- "Paste key missing. Pass a full paste URL or --key".to_string(),
- ));
- }
+ (None, None) => return Err(Error::MissingKey),
};
Ok(Self { access_token, key })
@@ -158,6 +198,21 @@ impl PasteLink {
self.key.link_fragment()
)
}
+
+ pub fn password_required(&self) -> bool {
+ self.key.password_required
+ }
+}
+
+fn validate_access_token(access_token: &str) -> Result<()> {
+ if (6..=32).contains(&access_token.len())
+ && access_token
+ .bytes()
+ .all(|byte| byte.is_ascii_alphanumeric())
+ {
+ return Ok(());
+ }
+ Err(Error::InvalidAccessToken)
}
#[derive(Debug, Serialize, Deserialize)]
@@ -193,6 +248,48 @@ pub struct Client {
api: Api,
}
+pub enum OpenPaste {
+ PasswordRequired,
+ Text(String),
+}
+
+pub struct PasteSession {
+ link: PasteLink,
+ payload: Option<PastePayload>,
+}
+
+impl PasteSession {
+ pub fn parse(input: &str) -> Result<Self> {
+ Ok(Self {
+ link: PasteLink::parse(input, None)?,
+ payload: None,
+ })
+ }
+
+ pub async fn open(&mut self, client: &Client) -> Result<OpenPaste> {
+ if self.link.password_required() {
+ client.check(&self.link.access_token).await?;
+ Ok(OpenPaste::PasswordRequired)
+ } else {
+ self.consume(client, None).await.map(OpenPaste::Text)
+ }
+ }
+
+ pub async fn consume(&mut self, client: &Client, password: Option<&str>) -> Result<String> {
+ if self.link.password_required() && password.filter(|value| !value.is_empty()).is_none() {
+ return Err(Error::PasswordRequired);
+ }
+ if let Some(payload) = &self.payload {
+ return decrypt(payload, &self.link.key, password);
+ }
+
+ let payload = client.consume(&self.link.access_token).await?;
+ let result = decrypt(&payload, &self.link.key, password);
+ self.payload = Some(payload);
+ result
+ }
+}
+
impl Client {
pub fn new(origin: String, user_agent: Option<String>) -> Result<Self> {
Ok(Self {
@@ -228,28 +325,55 @@ impl Client {
}
pub async fn check(&self, access_token: &str) -> Result<()> {
+ validate_access_token(access_token)?;
self.guard(access_token).await?;
Ok(())
}
pub async fn consume(&self, access_token: &str) -> Result<PastePayload> {
+ validate_access_token(access_token)?;
+ #[cfg(target_arch = "wasm32")]
+ self.guard(access_token).await?;
+ #[cfg(not(target_arch = "wasm32"))]
let cookie = self.guard(access_token).await?;
- Ok(self
+ let request = self
.api
.post("/paste/consume")
.json(&PasteTokenRequest {
access_token: access_token.to_string(),
})
- .header("X-Paste-Consume", "1")
- .header("Cookie", &cookie)
+ .header("X-Paste-Consume", "1");
+ #[cfg(target_arch = "wasm32")]
+ let request = request.credentials_include();
+ #[cfg(not(target_arch = "wasm32"))]
+ let request = request.header("Cookie", &cookie);
+ Ok(request
.send()
.await?
.error_for_code()
- .await?
+ .await
+ .map_err(map_consume_error)?
.json()
.await?)
}
+ #[cfg(target_arch = "wasm32")]
+ async fn guard(&self, access_token: &str) -> Result<()> {
+ self.api
+ .post("/paste/guard")
+ .json(&PasteTokenRequest {
+ access_token: access_token.to_string(),
+ })
+ .credentials_include()
+ .send()
+ .await?
+ .error_for_code()
+ .await
+ .map_err(map_consume_error)?;
+ Ok(())
+ }
+
+ #[cfg(not(target_arch = "wasm32"))]
async fn guard(&self, access_token: &str) -> Result<String> {
let response = self
.api
@@ -260,8 +384,8 @@ impl Client {
.send()
.await?
.error_for_code()
- .await?;
-
+ .await
+ .map_err(map_consume_error)?;
let cookie_prefix = format!("{PASTE_GUARD_COOKIE}=");
response
.headers()
@@ -275,6 +399,13 @@ impl Client {
}
}
+fn map_consume_error(error: http::Error) -> Error {
+ match error.status_code() {
+ Some(404 | 410) => Error::Unavailable,
+ _ => Error::Http(error),
+ }
+}
+
pub fn decrypt(payload: &PastePayload, key: &PasteKey, password: Option<&str>) -> Result<String> {
let key_encryption_key = derive_key_encryption_key(key, password, payload)?;
let (encrypted_paste_key, nonce) = decode_wrapped_paste_key(payload)?;
@@ -287,6 +418,7 @@ pub fn decrypt(payload: &PastePayload, key: &PasteKey, password: Option<&str>) -
}
pub fn encrypt(text: &str, password: Option<&str>) -> Result<(PasteKey, PastePayload)> {
+ validate_text(text)?;
let params = if password.is_some() {
argon::Params::MODERATE
} else {
@@ -295,6 +427,16 @@ pub fn encrypt(text: &str, password: Option<&str>) -> Result<(PasteKey, PastePay
encrypt_with_kdf_params(text, password, params)
}
+pub fn validate_text(text: &str) -> Result<()> {
+ if text.trim().is_empty() {
+ return Err(Error::EmptyText);
+ }
+ if text.chars().count() > MAX_PASTE_CHARS {
+ return Err(Error::TextTooLong);
+ }
+ Ok(())
+}
+
fn encrypt_with_kdf_params(
text: &str,
password: Option<&str>,
@@ -407,6 +549,21 @@ mod tests {
assert_eq!(payload.kdf_ops_limit, argon::Params::INTERACTIVE.ops_limit);
}
+ #[test]
+ fn validate_paste_text() {
+ assert!(validate_text("hello").is_ok());
+ assert!(matches!(validate_text(" \n"), Err(Error::EmptyText)));
+ assert!(validate_text(&"πŸ˜€".repeat(MAX_PASTE_CHARS)).is_ok());
+ assert!(matches!(
+ validate_text(&"πŸ˜€".repeat(MAX_PASTE_CHARS + 1)),
+ Err(Error::TextTooLong)
+ ));
+ assert!(matches!(
+ validate_text(&"a".repeat(MAX_PASTE_CHARS + 1)),
+ Err(Error::TextTooLong)
+ ));
+ }
+
#[test]
fn encrypt_password_protected_paste_payload_uses_moderate_kdf() {
let (paste_key, payload) = encrypt("protected paste", Some("correct horse")).unwrap();
@@ -431,6 +588,32 @@ mod tests {
assert_eq!(text, "protected paste");
}
+ #[test]
+ fn decrypt_legacy_web_paste_payloads() {
+ let payload: PastePayload = serde_json::from_str(
+ r#"{"encryptedData":"niesGyZo1AlMtTMfgRLskd+McdrMTLRCt6nHvSY39Aw4U2clYPI01nj8VmTOyA==","decryptionHeader":"Lqb0aj5VlGwfTNi69GFvK7Rahl4dVa17","encryptedPasteKey":"+NH/0c9+yIfTGKFfs1fxvY7vPAB6OP0QcjBcZvZ01K/qGXoJTSJobjDNOmS5Si78","encryptedPasteKeyNonce":"+NAxXQ59SDU7YqWhJHpBvWqkuGerwvlh","kdfNonce":"xzT60ys77A8WEg4SToeRYQ==","kdfMemLimit":67108864,"kdfOpsLimit":2}"#,
+ )
+ .unwrap();
+ assert_eq!(
+ decrypt(&payload, &PasteKey::parse("AbCd1234EfGh").unwrap(), None).unwrap(),
+ "legacy web fixture"
+ );
+
+ let payload: PastePayload = serde_json::from_str(
+ r#"{"encryptedData":"FkWTCxgHGPAc+1v0B21D+4dYpZpNP33Xhd0MgmbvPg7d9EDFv5ZAt++NQ3NcfiFPtzHBrg==","decryptionHeader":"JV7V6Ba0/daql+mfQ/UpUSICw1ErDG3Q","encryptedPasteKey":"Wle7cpaMWaor0z8m1LYMufl7Qw5k3mNAF2OvjGZs4/nigJHgYbrjZaJN9KtkMGuW","encryptedPasteKeyNonce":"3gLFpRkUvzPTc7QYPzfZ9CrVOivJ5tZF","kdfNonce":"1PJBf1pkftMWXeKyJtb4tw==","kdfMemLimit":268435456,"kdfOpsLimit":3}"#,
+ )
+ .unwrap();
+ assert_eq!(
+ decrypt(
+ &payload,
+ &PasteKey::parse("p-1234567890ab").unwrap(),
+ Some("correct horse")
+ )
+ .unwrap(),
+ "legacy protected fixture"
+ );
+ }
+
#[test]
fn reject_wrong_paste_password() {
let (paste_key, payload) =
@@ -527,7 +710,7 @@ mod tests {
)
.unwrap_err();
- assert!(matches!(error, Error::InvalidInput(_)));
+ assert!(matches!(error, Error::KeyMismatch));
}
#[tokio::test]
@@ -568,4 +751,75 @@ mod tests {
guard.assert_async().await;
consume.assert_async().await;
}
+
+ #[tokio::test]
+ async fn session_retains_consumed_payload_for_password_retry() {
+ let access_token = "ABC123";
+ let password = "correct horse";
+ let (key, payload) =
+ encrypt_with_kdf_params("guarded paste", Some(password), argon::Params::MIN).unwrap();
+ let mut server = Server::new_async().await;
+
+ let guard = server
+ .mock("POST", "/paste/guard")
+ .match_body(Matcher::PartialJson(serde_json::json!({
+ "accessToken": access_token,
+ })))
+ .with_status(200)
+ .with_header("set-cookie", "paste_guard=test-cookie; Path=/; HttpOnly")
+ .with_body("{}")
+ .expect(2)
+ .create_async()
+ .await;
+ let consume = server
+ .mock("POST", "/paste/consume")
+ .match_header("x-paste-consume", "1")
+ .match_header("cookie", "paste_guard=test-cookie")
+ .with_status(200)
+ .with_body(serde_json::to_string(&payload).unwrap())
+ .create_async()
+ .await;
+
+ let client = Client::new(server.url(), None).unwrap();
+ let mut session = PasteSession {
+ link: PasteLink {
+ access_token: access_token.to_string(),
+ key,
+ },
+ payload: None,
+ };
+
+ assert!(matches!(
+ session.open(&client).await.unwrap(),
+ OpenPaste::PasswordRequired
+ ));
+ assert!(matches!(
+ session.consume(&client, Some("wrong horse")).await,
+ Err(Error::IncorrectPassword)
+ ));
+ assert_eq!(
+ session.consume(&client, Some(password)).await.unwrap(),
+ "guarded paste"
+ );
+ guard.assert_async().await;
+ consume.assert_async().await;
+ }
+
+ #[tokio::test]
+ async fn maps_unavailable_pastes() {
+ let mut server = Server::new_async().await;
+ let guard = server
+ .mock("POST", "/paste/guard")
+ .with_status(410)
+ .with_body(r#"{"code":"NOT_FOUND"}"#)
+ .create_async()
+ .await;
+ let client = Client::new(server.url(), None).unwrap();
+
+ assert!(matches!(
+ client.check("ABC123").await,
+ Err(Error::Unavailable)
+ ));
+ guard.assert_async().await;
+ }
}
diff --git a/rust/crates/space/src/crypto.rs b/rust/crates/space/src/crypto.rs
index de1a0bc207..ffb7770911 100644
--- a/rust/crates/space/src/crypto.rs
+++ b/rust/crates/space/src/crypto.rs
@@ -7,6 +7,30 @@ use crate::error::Result;
pub(crate) const SECRETBOX_PAYLOAD_OVERHEAD_BYTES: usize = Nonce::BYTES + secretbox::MAC_BYTES;
pub(crate) const ASSET_PAYLOAD_OVERHEAD_BYTES: usize = blob::HEADER_BYTES + blob::ABYTES;
+pub fn encrypt_space_root_entity_key(
+ space_root_key_b64: &str,
+ master_key_b64: &str,
+) -> Result<String> {
+ let space_root_key = b64::decode(space_root_key_b64)?;
+ let master_key = b64::decode(master_key_b64)?;
+ Ok(b64::encode(&encrypt_secretbox_payload(
+ &master_key,
+ &space_root_key,
+ )?))
+}
+
+pub fn decrypt_space_root_entity_key(
+ encrypted_key_b64: &str,
+ master_key_b64: &str,
+) -> Result<String> {
+ let encrypted_key = b64::decode(encrypted_key_b64)?;
+ let master_key = b64::decode(master_key_b64)?;
+ Ok(b64::encode(&decrypt_secretbox_payload(
+ &master_key,
+ &encrypted_key,
+ )?))
+}
+
pub(crate) fn generate_key() -> Vec<u8> {
Key::generate().as_bytes().to_vec()
}
@@ -66,10 +90,10 @@ mod tests {
#[test]
fn secretbox_payload_round_trip() {
- let key = generate_key();
- let plaintext = b"hello space";
- let payload = encrypt_secretbox_payload(&key, plaintext).unwrap();
- let decrypted = decrypt_secretbox_payload(&key, &payload).unwrap();
+ let key = b64::encode(&generate_key());
+ let plaintext = b64::encode(b"hello space");
+ let payload = encrypt_space_root_entity_key(&plaintext, &key).unwrap();
+ let decrypted = decrypt_space_root_entity_key(&payload, &key).unwrap();
assert_eq!(decrypted, plaintext);
}
diff --git a/rust/crates/space/src/lib.rs b/rust/crates/space/src/lib.rs
index 816651932e..f2a897bf52 100644
--- a/rust/crates/space/src/lib.rs
+++ b/rust/crates/space/src/lib.rs
@@ -11,6 +11,7 @@ pub use client::{
MAX_SPACE_MESSAGE_TEXT_BYTES, MAX_SPACE_MESSAGE_TEXT_CHARS, MAX_SPACE_POST_PLAINTEXT_BYTES,
MAX_SPACE_POST_UPLOAD_BYTES, PostPhotoAssetOptions, SpaceLinkCtx,
};
+pub use crypto::{decrypt_space_root_entity_key, encrypt_space_root_entity_key};
pub use error::{Result, SpaceError};
pub use models::{
CreatedSpace, CreatedSpaceLink, DecryptedFriendShare, DecryptedMessage, DecryptedPost,
diff --git a/web/.gitignore b/web/.gitignore
index f80cbdb8b5..68f52ede22 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -10,7 +10,4 @@ dist
out/
next-env.d.ts
-packages/wasm/pkg/
-packages/wasm/cast/pkg/
-packages/wasm/space/pkg/
-packages/wasm-core/pkg/
+packages/wasm/*/pkg/
diff --git a/web/.prettierignore b/web/.prettierignore
index 0e6b314e69..ea43f1ea39 100644
--- a/web/.prettierignore
+++ b/web/.prettierignore
@@ -1,5 +1,2 @@
package-lock.json
-packages/wasm/pkg-srp/**
-packages/wasm/pkg/**
-packages/wasm/space/pkg/**
-packages/wasm/target/**
+packages/wasm/*/pkg/**
diff --git a/web/apps/ensu/package.json b/web/apps/ensu/package.json
index 284e8b53ed..734712717e 100644
--- a/web/apps/ensu/package.json
+++ b/web/apps/ensu/package.json
@@ -14,7 +14,7 @@
"@tauri-apps/plugin-updater": "2.10.1",
"@wllama/wllama": "2.4.0",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"idb": "8.0.3",
"katex": "0.17.0",
"react-markdown": "10.1.0",
diff --git a/web/apps/ensu/src/services/wasm.ts b/web/apps/ensu/src/services/wasm.ts
index 0ec03ace7d..f423938ced 100644
--- a/web/apps/ensu/src/services/wasm.ts
+++ b/web/apps/ensu/src/services/wasm.ts
@@ -1,7 +1,7 @@
import { isTauriRuntime } from "@/services/tauri-runtime";
-import { loadEnteWasm } from "ente-wasm/load";
+import { loadEnteWasm } from "ente-core-wasm/load";
-export type EnteWasmModule = typeof import("ente-wasm");
+export type EnteWasmModule = typeof import("ente-core-wasm");
export interface EncryptedBlob {
encrypted_data: string;
diff --git a/web/apps/legacy/package.json b/web/apps/legacy/package.json
index 8974f3b125..aca7df02db 100644
--- a/web/apps/legacy/package.json
+++ b/web/apps/legacy/package.json
@@ -6,7 +6,7 @@
"@mui/icons-material": "9.3.1",
"ente-accounts": "*",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"pdfjs-dist": "6.2.108",
"qr": "0.6.0",
"zod": "4.4.3"
diff --git a/web/apps/legacy/src/features/legacy-kit/recovery.ts b/web/apps/legacy/src/features/legacy-kit/recovery.ts
index b55f3d65ec..f9d3dd4d20 100644
--- a/web/apps/legacy/src/features/legacy-kit/recovery.ts
+++ b/web/apps/legacy/src/features/legacy-kit/recovery.ts
@@ -1,7 +1,7 @@
import { clientPackageName, desktopAppVersion, isDesktop } from "ente-base/app";
import { apiOrigin } from "ente-base/origins";
-import type { LegacyKitRecoveryHandle } from "ente-wasm";
-import { loadCryptoReadyEnteWasm } from "ente-wasm/load";
+import type { LegacyKitRecoveryHandle } from "ente-core-wasm";
+import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
import { z } from "zod";
import type { LegacyKitShare } from "./share";
diff --git a/web/apps/legacy/src/pages/index.tsx b/web/apps/legacy/src/pages/index.tsx
index 0bd047a29a..a44b4eaccf 100644
--- a/web/apps/legacy/src/pages/index.tsx
+++ b/web/apps/legacy/src/pages/index.tsx
@@ -20,7 +20,7 @@ import { LoadingButton } from "ente-base/components/mui/LoadingButton";
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
import { isDevBuild } from "ente-base/env";
import log from "ente-base/log";
-import type { LegacyKitRecoveryHandle } from "ente-wasm";
+import type { LegacyKitRecoveryHandle } from "ente-core-wasm";
import React, { useCallback, useEffect, useMemo, useState } from "react";
import {
changeLegacyKitPassword,
diff --git a/web/apps/locker/package.json b/web/apps/locker/package.json
index de133cf2a1..666186aac1 100644
--- a/web/apps/locker/package.json
+++ b/web/apps/locker/package.json
@@ -8,7 +8,7 @@
"ente-accounts": "*",
"ente-base": "*",
"ente-contacts-web": "*",
- "ente-wasm": "*"
+ "ente-core-wasm": "*"
},
"devDependencies": {
"ente-build-config": "*"
diff --git a/web/apps/locker/src/services/crypto.ts b/web/apps/locker/src/services/crypto.ts
index e5d7613541..3df85bc280 100644
--- a/web/apps/locker/src/services/crypto.ts
+++ b/web/apps/locker/src/services/crypto.ts
@@ -5,7 +5,7 @@ import type {
EncryptedFile,
KeyPair,
} from "ente-base/crypto/types";
-import { loadCryptoReadyEnteWasm } from "ente-wasm/load";
+import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
const shouldFallbackToLegacyBlobDecrypt = (error: unknown): boolean => {
if (!error || typeof error !== "object") {
diff --git a/web/apps/paste/package.json b/web/apps/paste/package.json
index 2d83c6b310..c80109e2c8 100644
--- a/web/apps/paste/package.json
+++ b/web/apps/paste/package.json
@@ -10,6 +10,7 @@
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.6",
"ente-base": "*",
+ "ente-paste-wasm": "*",
"qr-code-styling": "1.9.2"
},
"devDependencies": {
diff --git a/web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx b/web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx
index 69b86559c3..9f46227d6d 100644
--- a/web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx
+++ b/web/apps/paste/src/features/paste/components/PasteCreatePanel.tsx
@@ -1,3 +1,4 @@
+import { MAX_PASTE_CHARS } from "@/features/paste/hooks/useCreatePaste";
import { usePasteColorMode } from "@/features/paste/hooks/usePasteColorMode";
import { getPasteThemeTokens } from "@/features/paste/theme/pasteThemeTokens";
import { Navigation06Icon } from "@hugeicons/core-free-icons";
@@ -21,7 +22,6 @@ import {
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
import type { SubmitEvent } from "react";
import { useState } from "react";
-import { MAX_PASTE_CHARS } from "../constants";
import { PasteLinkCard } from "./PasteLinkCard";
import { downloadPasteQrCode } from "./qrCode";
import { pasteTextFieldSx } from "./textFieldSx";
@@ -59,8 +59,7 @@ export const PasteCreatePanel = ({
const [showConfirmPassword, setShowConfirmPassword] = useState(false);
const [passwordError, setPasswordError] = useState<string | null>(null);
const isInputEmpty = inputText.trim().length === 0;
- const nearLimitThreshold = Math.floor(MAX_PASTE_CHARS * 0.9);
- const isNearCharLimit = inputText.length >= nearLimitThreshold;
+ const isNearCharLimit = inputText.length >= MAX_PASTE_CHARS * 0.9;
const isCreateDisabled = isInputEmpty;
const passwordTooltip = passwordProtected
? "Password protection enabled"
diff --git a/web/apps/paste/src/features/paste/constants.ts b/web/apps/paste/src/features/paste/constants.ts
deleted file mode 100644
index b46587d33f..0000000000
--- a/web/apps/paste/src/features/paste/constants.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const MAX_PASTE_CHARS = 4000;
-
-export const FRAGMENT_SECRET_LENGTH = 12;
-
-export const FRAGMENT_SECRET_PATTERN = /^[0-9A-Za-z]{12}$/;
-
-export const PASSWORD_FRAGMENT_PREFIX = "p-";
-
-export const PASSWORD_KDF_CONTEXT = "ente-paste-password-v1";
diff --git a/web/apps/paste/src/features/paste/hooks/useConsumePaste.ts b/web/apps/paste/src/features/paste/hooks/useConsumePaste.ts
index 96b2fd2dc0..461baa151f 100644
--- a/web/apps/paste/src/features/paste/hooks/useConsumePaste.ts
+++ b/web/apps/paste/src/features/paste/hooks/useConsumePaste.ts
@@ -1,112 +1,99 @@
-import { consumePaste, setGuard, type PastePayload } from "@/services/paste";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { pasteClient } from "@/services/paste";
+import { useEffect, useRef, useState } from "react";
import type { PageMode } from "../types";
import { waitUntilVisible } from "../utils/browser";
-import {
- decryptConsumedPaste,
- IncorrectPastePasswordError,
- parsePasteKey,
- type PasteKey,
-} from "../utils/pasteCrypto";
-const errorMessage = (error: unknown) =>
- error instanceof Error ? error.message : "Paste is unavailable";
+const consumeErrorMessage = (error: unknown) => {
+ if (!(error instanceof Error)) return "Paste is unavailable";
+ switch (error.name) {
+ case "missing_key":
+ return "Missing key in URL";
+ case "invalid_link":
+ case "invalid_access_token":
+ case "key_mismatch":
+ return "Invalid paste link";
+ case "invalid_key":
+ return "Invalid key in URL";
+ case "unavailable":
+ return "This paste has expired or was already opened";
+ case "network":
+ return "Couldn't connect to Ente";
+ case "request_failed":
+ return "Couldn't open paste";
+ case "crypto":
+ case "malformed_payload":
+ return "Unable to decrypt paste";
+ default:
+ return "Paste is unavailable";
+ }
+};
-export const useConsumePaste = (mode: PageMode, accessToken: string | null) => {
+export const useConsumePaste = (mode: PageMode) => {
const [consuming, setConsuming] = useState(false);
const [consumeError, setConsumeError] = useState<string | null>(null);
const [resolvedText, setResolvedText] = useState<string | null>(null);
const [passwordRequired, setPasswordRequired] = useState(false);
const [passwordError, setPasswordError] = useState<string | null>(null);
-
+ const openStartedRef = useRef(false);
const consumeInFlightRef = useRef(false);
- const consumedPayloadRef = useRef<PastePayload | null>(null);
- const pasteKeyRef = useRef<PasteKey | null>(null);
- const confirmPasteAvailable = useCallback(async () => {
- if (!accessToken) return;
+ useEffect(() => {
+ if (mode !== "view" || openStartedRef.current) return;
+ openStartedRef.current = true;
- try {
+ const open = async () => {
setConsuming(true);
setConsumeError(null);
- await waitUntilVisible();
- await setGuard(accessToken);
- setPasswordRequired(true);
- } catch (error) {
- setConsumeError(errorMessage(error));
- } finally {
- setConsuming(false);
- }
- }, [accessToken]);
-
- const consume = useCallback(
- async (pasteKey: PasteKey, password?: string) => {
- if (!accessToken || consumeInFlightRef.current) {
- return;
- }
- consumeInFlightRef.current = true;
try {
- setConsuming(true);
- setConsumeError(null);
- setPasswordError(null);
-
- let payload = consumedPayloadRef.current;
- if (!payload) {
- await waitUntilVisible();
- await setGuard(accessToken);
- payload = await consumePaste(accessToken);
- consumedPayloadRef.current = payload;
- }
-
- setResolvedText(
- await decryptConsumedPaste(pasteKey, payload, password),
- );
- setPasswordRequired(false);
- } catch (error) {
- if (error instanceof IncorrectPastePasswordError) {
- setPasswordError(error.message);
+ await waitUntilVisible();
+ const paste = await (
+ await pasteClient()
+ ).open(window.location.href);
+ if (paste.passwordRequired) {
+ setPasswordRequired(true);
} else {
- setConsumeError(errorMessage(error));
+ setResolvedText(paste.text);
}
+ } catch (error) {
+ setConsumeError(consumeErrorMessage(error));
} finally {
- consumeInFlightRef.current = false;
setConsuming(false);
}
- },
- [accessToken],
- );
+ };
- useEffect(() => {
- if (mode !== "view" || !accessToken || pasteKeyRef.current) return;
-
- try {
- const fragment = window.location.hash.slice(1).trim();
- if (!fragment) {
- throw new Error("Missing key in URL");
- }
-
- const pasteKey = parsePasteKey(fragment);
- pasteKeyRef.current = pasteKey;
- if (pasteKey.passwordRequired) {
- void confirmPasteAvailable();
- } else {
- void consume(pasteKey);
- }
- } catch (error) {
- setConsumeError(errorMessage(error));
- }
- }, [mode, accessToken, confirmPasteAvailable, consume]);
+ void open();
+ }, [mode]);
const submitPassword = async (password: string) => {
if (!password) {
setPasswordError("Enter the paste password");
return;
}
- if (!pasteKeyRef.current) {
- setConsumeError("Missing key in URL");
- return;
+ if (consumeInFlightRef.current) return;
+ consumeInFlightRef.current = true;
+ setConsuming(true);
+ setConsumeError(null);
+ setPasswordError(null);
+ try {
+ setResolvedText(
+ await (await pasteClient()).submitPassword(password),
+ );
+ setPasswordRequired(false);
+ } catch (error) {
+ if (error instanceof Error && error.name === "incorrect_password") {
+ setPasswordError("Incorrect paste password");
+ } else if (
+ error instanceof Error &&
+ error.name === "password_required"
+ ) {
+ setPasswordError("Enter the paste password");
+ } else {
+ setConsumeError(consumeErrorMessage(error));
+ }
+ } finally {
+ consumeInFlightRef.current = false;
+ setConsuming(false);
}
- await consume(pasteKeyRef.current, password);
};
return {
diff --git a/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts b/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts
index 376cf37c9e..57a8a92c5d 100644
--- a/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts
+++ b/web/apps/paste/src/features/paste/hooks/useCreatePaste.ts
@@ -1,10 +1,22 @@
-import { createPaste } from "@/services/paste";
+import { pasteClient } from "@/services/paste";
import { useState } from "react";
-import { MAX_PASTE_CHARS } from "../constants";
-import { encryptPasteForCreate } from "../utils/pasteCrypto";
-const buildPasteLink = (accessToken: string, fragmentSecret: string) =>
- `${window.location.origin}/${accessToken}#${fragmentSecret}`;
+// Duplicate the constant to avoid loading the entire WASM.
+export const MAX_PASTE_CHARS = 4000;
+
+const createErrorMessage = (error: unknown) => {
+ if (!(error instanceof Error)) return "Failed to create paste";
+ switch (error.name) {
+ case "empty_text":
+ return "Enter some text first";
+ case "text_too_long":
+ return `Paste is limited to ${MAX_PASTE_CHARS} characters`;
+ case "network":
+ return "Couldn't connect to Ente";
+ default:
+ return "Failed to create paste";
+ }
+};
export const useCreatePaste = () => {
const [inputText, setInputText] = useState("");
@@ -15,33 +27,16 @@ export const useCreatePaste = () => {
useState(false);
const createSecureLink = async (password?: string) => {
- setCreateError(null);
-
- if (!inputText.trim()) {
- setCreateError("Enter some text first");
- return;
- }
-
- if (inputText.length > MAX_PASTE_CHARS) {
- setCreateError(`Paste is limited to ${MAX_PASTE_CHARS} characters`);
- return;
- }
-
setCreating(true);
+ setCreateError(null);
try {
- const { linkFragment, payload } = await encryptPasteForCreate(
- inputText,
- password,
- );
- const response = await createPaste(payload);
- setCreatedLink(buildPasteLink(response.accessToken, linkFragment));
- setCreatedLinkPasswordProtected(!!password);
+ const paste = await (
+ await pasteClient()
+ ).create(window.location.origin, inputText, password);
+ setCreatedLink(paste.url);
+ setCreatedLinkPasswordProtected(paste.passwordRequired);
} catch (error) {
- const message =
- error instanceof Error
- ? error.message
- : "Failed to create paste";
- setCreateError(message);
+ setCreateError(createErrorMessage(error));
} finally {
setCreating(false);
}
diff --git a/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts b/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts
index 6a941f3eca..ccb7025233 100644
--- a/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts
+++ b/web/apps/paste/src/features/paste/hooks/usePasteRoute.ts
@@ -3,7 +3,6 @@ import type { PageMode } from "../types";
export const usePasteRoute = () => {
const [mode, setMode] = useState<PageMode>("create");
- const [accessToken, setAccessToken] = useState<string | null>(null);
useEffect(() => {
const cleanPath = window.location.pathname.replace(/^\/+|\/+$/g, "");
@@ -13,8 +12,7 @@ export const usePasteRoute = () => {
}
setMode("view");
- setAccessToken(cleanPath.split("/")[0] ?? null);
}, []);
- return { mode, accessToken };
+ return mode;
};
diff --git a/web/apps/paste/src/features/paste/utils/pasteCrypto.ts b/web/apps/paste/src/features/paste/utils/pasteCrypto.ts
deleted file mode 100644
index 0e0faa797a..0000000000
--- a/web/apps/paste/src/features/paste/utils/pasteCrypto.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import type { PastePayload } from "@/services/paste";
-import {
- decryptBox,
- decryptMetadataJSON,
- deriveInteractiveKey,
- deriveKey,
- deriveModerateKey,
- encryptBox,
- encryptMetadataJSON,
- generateKey,
-} from "ente-base/crypto";
-import { newID } from "ente-base/id";
-import {
- FRAGMENT_SECRET_LENGTH,
- FRAGMENT_SECRET_PATTERN,
- PASSWORD_FRAGMENT_PREFIX,
- PASSWORD_KDF_CONTEXT,
-} from "../constants";
-
-export interface PasteKey {
- fragmentSecret: string;
- passwordRequired: boolean;
-}
-
-export class IncorrectPastePasswordError extends Error {
- constructor() {
- super("Incorrect paste password");
- }
-}
-
-export const createFragmentSecret = () =>
- newID("").slice(0, FRAGMENT_SECRET_LENGTH);
-
-const pasteKeyLinkFragment = (pasteKey: PasteKey) =>
- pasteKey.passwordRequired
- ? `${PASSWORD_FRAGMENT_PREFIX}${pasteKey.fragmentSecret}`
- : pasteKey.fragmentSecret;
-
-export const encryptPasteForCreate = async (
- text: string,
- password?: string,
-) => {
- const key = await generateKey();
- const fragmentSecret = createFragmentSecret();
- const pasteKey = { fragmentSecret, passwordRequired: !!password };
-
- const encrypted = await encryptMetadataJSON({ text }, key);
- const keyEncryptionKey = password
- ? await deriveModerateKey(pasteKeyKdfSecret(pasteKey, password))
- : await deriveInteractiveKey(fragmentSecret);
- const encryptedPasteKey = await encryptBox(key, keyEncryptionKey.key);
-
- return {
- linkFragment: pasteKeyLinkFragment(pasteKey),
- payload: {
- encryptedData: encrypted.encryptedData,
- decryptionHeader: encrypted.decryptionHeader,
- encryptedPasteKey: encryptedPasteKey.encryptedData,
- encryptedPasteKeyNonce: encryptedPasteKey.nonce,
- kdfNonce: keyEncryptionKey.salt,
- kdfMemLimit: keyEncryptionKey.memLimit,
- kdfOpsLimit: keyEncryptionKey.opsLimit,
- } satisfies PastePayload,
- };
-};
-
-export const parsePasteKey = (fragment: string): PasteKey => {
- const passwordRequired = fragment.startsWith(PASSWORD_FRAGMENT_PREFIX);
- const fragmentSecret = passwordRequired
- ? fragment.slice(PASSWORD_FRAGMENT_PREFIX.length)
- : fragment;
-
- if (!FRAGMENT_SECRET_PATTERN.test(fragmentSecret)) {
- throw new Error("Invalid key in URL");
- }
-
- return { fragmentSecret, passwordRequired };
-};
-
-const pasteKeyKdfSecret = (pasteKey: PasteKey, password?: string) => {
- if (!pasteKey.passwordRequired) {
- return pasteKey.fragmentSecret;
- }
- if (!password) {
- throw new Error("Password required");
- }
- return `${PASSWORD_KDF_CONTEXT}\n${pasteKey.fragmentSecret}\n${password}`;
-};
-
-const resolvePasteKey = async (
- pasteKey: PasteKey,
- payload: PastePayload,
- password?: string,
-) => {
- const keyEncryptionKey = await deriveKey(
- pasteKeyKdfSecret(pasteKey, password),
- payload.kdfNonce,
- payload.kdfOpsLimit,
- payload.kdfMemLimit,
- );
-
- try {
- return await decryptBox(
- {
- encryptedData: payload.encryptedPasteKey,
- nonce: payload.encryptedPasteKeyNonce,
- },
- keyEncryptionKey,
- );
- } catch (error) {
- if (pasteKey.passwordRequired) {
- throw new IncorrectPastePasswordError();
- }
- throw error;
- }
-};
-
-export const decryptConsumedPaste = async (
- pasteKey: PasteKey,
- payload: PastePayload,
- password?: string,
-) => {
- const key = await resolvePasteKey(pasteKey, payload, password);
- const decrypted = (await decryptMetadataJSON(
- {
- encryptedData: payload.encryptedData,
- decryptionHeader: payload.decryptionHeader,
- },
- key,
- )) as { text?: string };
-
- if (typeof decrypted.text !== "string") {
- throw new Error("Unable to decrypt paste");
- }
-
- return decrypted.text;
-};
diff --git a/web/apps/paste/src/pages/index.tsx b/web/apps/paste/src/pages/index.tsx
index d69caa7bd9..4a22a6a0fd 100644
--- a/web/apps/paste/src/pages/index.tsx
+++ b/web/apps/paste/src/pages/index.tsx
@@ -13,7 +13,7 @@ import { Stack } from "@mui/material";
import Head from "next/head";
const Page = () => {
- const { mode, accessToken } = usePasteRoute();
+ const mode = usePasteRoute();
const {
inputText,
@@ -32,7 +32,7 @@ const Page = () => {
passwordRequired,
passwordError,
submitPassword,
- } = useConsumePaste(mode, accessToken);
+ } = useConsumePaste(mode);
return (
<>
diff --git a/web/apps/paste/src/services/paste.ts b/web/apps/paste/src/services/paste.ts
index e3cdc0dd15..a11acad77f 100644
--- a/web/apps/paste/src/services/paste.ts
+++ b/web/apps/paste/src/services/paste.ts
@@ -1,72 +1,7 @@
-import { apiURL } from "ente-base/origins";
+import { apiOrigin } from "ente-base/origins";
+import { PasteClient } from "ente-paste-wasm";
-export interface CreatePasteResponse {
- accessToken: string;
- expiresAt: number;
-}
+let client: Promise<PasteClient> | undefined;
-export interface PastePayload {
- encryptedData: string;
- decryptionHeader: string;
- encryptedPasteKey: string;
- encryptedPasteKeyNonce: string;
- kdfNonce: string;
- kdfMemLimit: number;
- kdfOpsLimit: number;
-}
-
-const parseError = async (
- response: Response,
- context: "create" | "guard" | "consume",
-) => {
- if (
- (context === "consume" || context === "guard") &&
- (response.status === 410 || response.status === 404)
- ) {
- return "This paste has expired or was already opened.";
- }
- try {
- const data = (await response.json()) as { message?: string };
- if (data.message) return data.message;
- } catch {
- // Fall back to the generic message below.
- }
- return `Request failed with status ${response.status}`;
-};
-
-export const createPaste = async (payload: PastePayload) => {
- const response = await fetch(await apiURL("/paste/create"), {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify(payload),
- });
- if (!response.ok) {
- throw new Error(await parseError(response, "create"));
- }
- return (await response.json()) as CreatePasteResponse;
-};
-
-export const setGuard = async (accessToken: string) => {
- const response = await fetch(await apiURL("/paste/guard"), {
- method: "POST",
- credentials: "include",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({ accessToken }),
- });
- if (!response.ok) {
- throw new Error(await parseError(response, "guard"));
- }
-};
-
-export const consumePaste = async (accessToken: string) => {
- const response = await fetch(await apiURL("/paste/consume"), {
- method: "POST",
- credentials: "include",
- headers: { "Content-Type": "application/json", "X-Paste-Consume": "1" },
- body: JSON.stringify({ accessToken }),
- });
- if (!response.ok) {
- throw new Error(await parseError(response, "consume"));
- }
- return (await response.json()) as PastePayload;
-};
+export const pasteClient = () =>
+ (client ??= apiOrigin().then((origin) => PasteClient.init(origin)));
diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json
index 9031578781..3dae2e1530 100644
--- a/web/apps/photos/package.json
+++ b/web/apps/photos/package.json
@@ -17,10 +17,10 @@
"ente-base": "*",
"ente-cast-wasm": "*",
"ente-contacts-web": "*",
+ "ente-core-wasm": "*",
"ente-gallery": "*",
"ente-media": "*",
"ente-new": "*",
- "ente-wasm": "*",
"i18next": "26.3.1",
"memoize-one": "6.0.0",
"ml-matrix": "6.12.2",
diff --git a/web/apps/space/package.json b/web/apps/space/package.json
index 05ff284984..a4cbdb6105 100644
--- a/web/apps/space/package.json
+++ b/web/apps/space/package.json
@@ -12,10 +12,9 @@
"@hugeicons/react": "1.1.4",
"ente-accounts": "*",
"ente-base": "*",
+ "ente-core-wasm": "*",
"ente-media": "*",
"ente-space-wasm": "*",
- "ente-wasm": "*",
- "ente-wasm-core": "*",
"photoswipe": "5.4.4",
"react-easy-crop": "5.5.7",
"thumbhash": "0.1.1"
diff --git a/web/apps/space/src/services/spaceBootstrapAuth.ts b/web/apps/space/src/services/spaceBootstrapAuth.ts
index f41bab8a3e..fb90efb0ad 100644
--- a/web/apps/space/src/services/spaceBootstrapAuth.ts
+++ b/web/apps/space/src/services/spaceBootstrapAuth.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 { loadEnteWasm } from "ente-wasm/load";
+import { loadEnteWasm } from "ente-core-wasm/load";
import { z } from "zod";
export const spaceBootstrapAuthHeaders = (authToken: string) => ({
diff --git a/web/apps/space/src/services/spacePersistentSession.ts b/web/apps/space/src/services/spacePersistentSession.ts
index 44ed37045f..c1230e3b1a 100644
--- a/web/apps/space/src/services/spacePersistentSession.ts
+++ b/web/apps/space/src/services/spacePersistentSession.ts
@@ -14,11 +14,6 @@ import { ensureOk, publicRequestHeaders } from "ente-base/http";
import log from "ente-base/log";
import { apiURL } from "ente-base/origins";
import { removeAuthToken } from "ente-base/token";
-import {
- Key,
- secretboxDecryptCombined,
- secretboxEncryptCombined,
-} from "ente-wasm-core";
import { spaceBootstrapAuthHeaders } from "services/spaceBootstrapAuth";
import {
clearSpaceSecureSessionStorage,
@@ -73,31 +68,6 @@ type SpaceEntityKeyResponse = z.infer<typeof SpaceEntityKeyResponse>;
const spaceEntityKeyHeaderBytes = 24;
-const masterKeyToSecretboxKey = async (masterKey: string) =>
- Key.fromBytes(await fromB64(masterKey));
-
-const encryptSpaceRootEntityKey = async (
- spaceRootKey: string,
- masterKey: string,
-) =>
- toB64(
- await secretboxEncryptCombined(
- await fromB64(spaceRootKey),
- await masterKeyToSecretboxKey(masterKey),
- ),
- );
-
-const decryptSpaceRootEntityKey = async (
- encryptedKey: string,
- masterKey: string,
-) =>
- toB64(
- await secretboxDecryptCombined(
- await fromB64(encryptedKey),
- await masterKeyToSecretboxKey(masterKey),
- ),
- );
-
const splitSpaceEntityKey = async (encryptedKey: string) => {
const combined = await fromB64(encryptedKey);
if (combined.length <= spaceEntityKeyHeaderBytes) {
@@ -296,8 +266,10 @@ export const getOrCreateSpaceRootKey = async (
masterKey: string,
authToken: string,
) => {
+ const { decryptSpaceRootEntityKey, encryptSpaceRootEntityKey } =
+ await import("ente-space-wasm");
const candidate = await generateKey();
- const encryptedKey = await encryptSpaceRootEntityKey(candidate, masterKey);
+ const encryptedKey = encryptSpaceRootEntityKey(candidate, masterKey);
const splitKey = await splitSpaceEntityKey(encryptedKey);
const res = await fetch(await apiURL("/user-entity/key/ensure"), {
method: "POST",
diff --git a/web/package-lock.json b/web/package-lock.json
index 0456a24c0e..7c8b84618f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -10,8 +10,7 @@
"workspaces": [
"apps/*",
"packages/*",
- "packages/wasm/cast",
- "packages/wasm/space"
+ "packages/wasm/*"
],
"devDependencies": {
"concurrently": "10.0.4",
@@ -179,7 +178,7 @@
"@tauri-apps/plugin-updater": "2.10.1",
"@wllama/wllama": "2.4.0",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"idb": "8.0.3",
"katex": "0.17.0",
"react-markdown": "10.1.0",
@@ -213,7 +212,7 @@
"@mui/icons-material": "9.3.1",
"ente-accounts": "*",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"pdfjs-dist": "6.2.108",
"qr": "0.6.0",
"zod": "4.4.3"
@@ -230,7 +229,7 @@
"ente-accounts": "*",
"ente-base": "*",
"ente-contacts-web": "*",
- "ente-wasm": "*"
+ "ente-core-wasm": "*"
},
"devDependencies": {
"ente-build-config": "*"
@@ -258,6 +257,7 @@
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.6",
"ente-base": "*",
+ "ente-paste-wasm": "*",
"qr-code-styling": "1.9.2"
},
"devDependencies": {
@@ -293,10 +293,10 @@
"ente-base": "*",
"ente-cast-wasm": "*",
"ente-contacts-web": "*",
+ "ente-core-wasm": "*",
"ente-gallery": "*",
"ente-media": "*",
"ente-new": "*",
- "ente-wasm": "*",
"i18next": "26.3.1",
"memoize-one": "6.0.0",
"ml-matrix": "6.12.2",
@@ -342,10 +342,9 @@
"@hugeicons/react": "1.1.4",
"ente-accounts": "*",
"ente-base": "*",
+ "ente-core-wasm": "*",
"ente-media": "*",
"ente-space-wasm": "*",
- "ente-wasm": "*",
- "ente-wasm-core": "*",
"photoswipe": "5.4.4",
"react-easy-crop": "5.5.7",
"thumbhash": "0.1.1"
@@ -4738,6 +4737,10 @@
"resolved": "packages/contacts",
"link": true
},
+ "node_modules/ente-core-wasm": {
+ "resolved": "packages/wasm/core",
+ "link": true
+ },
"node_modules/ente-gallery": {
"resolved": "packages/gallery",
"link": true
@@ -4750,6 +4753,10 @@
"resolved": "packages/new",
"link": true
},
+ "node_modules/ente-paste-wasm": {
+ "resolved": "packages/wasm/paste",
+ "link": true
+ },
"node_modules/ente-space-wasm": {
"resolved": "packages/wasm/space",
"link": true
@@ -4758,14 +4765,6 @@
"resolved": "packages/utils",
"link": true
},
- "node_modules/ente-wasm": {
- "resolved": "packages/wasm",
- "link": true
- },
- "node_modules/ente-wasm-core": {
- "resolved": "packages/wasm-core",
- "link": true
- },
"node_modules/entities": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
@@ -11159,7 +11158,7 @@
"dependencies": {
"comlink": "4.4.2",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"react": "19.2.7",
"react-dom": "19.2.7",
"react-otp-input": "3.1.1",
@@ -11246,7 +11245,7 @@
"@mui/material": "9.3.1",
"ente-accounts": "*",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"react": "19.2.7",
"zod": "4.4.3"
},
@@ -11330,29 +11329,34 @@
"ente-build-config": "*"
}
},
- "packages/wasm": {
- "name": "ente-wasm",
+ "packages/wasm/cast": {
+ "name": "ente-cast-wasm",
"version": "0.0.0",
"devDependencies": {
"ente-build-config": "*",
- "vite-plugin-wasm": "3.6.0",
- "vitest": "4.1.8",
"wasm-pack": "0.15.0"
}
},
- "packages/wasm-core": {
- "name": "ente-wasm-core",
+ "packages/wasm/core": {
+ "name": "ente-core-wasm",
"version": "0.0.0",
"devDependencies": {
"ente-build-config": "*",
+ "vite-plugin-wasm": "3.6.0",
+ "vitest": "4.1.8",
"wasm-pack": "0.15.0"
}
},
- "packages/wasm/cast": {
- "name": "ente-cast-wasm",
+ "packages/wasm/paste": {
+ "name": "ente-paste-wasm",
"version": "0.0.0",
+ "dependencies": {
+ "comlink": "4.4.2"
+ },
"devDependencies": {
"ente-build-config": "*",
+ "vite-plugin-wasm": "3.6.0",
+ "vitest": "4.1.8",
"wasm-pack": "0.15.0"
}
},
diff --git a/web/package.json b/web/package.json
index 5da992470f..54f23ee631 100644
--- a/web/package.json
+++ b/web/package.json
@@ -5,8 +5,7 @@
"workspaces": [
"apps/*",
"packages/*",
- "packages/wasm/cast",
- "packages/wasm/space"
+ "packages/wasm/*"
],
"scripts": {
"build": "npm run build:photos",
@@ -20,14 +19,15 @@
"build:legacy": "npm run build:wasm && npm exec --workspace legacy -- next build --webpack",
"build:locker": "npm run build:wasm && npm exec --workspace locker -- next build --webpack",
"build:memories": "npm run build:wasm && npm exec --workspace memories -- next build --webpack && npm run build:post --workspace memories",
- "build:paste": "npm run build:wasm && npm exec --workspace paste -- next build --webpack && npm run build:post --workspace paste",
+ "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 -- --no-pack",
"build:payments": "npm run build --workspace payments",
"build:photos": "npm run build:wasm && npm run build:cast-wasm && npm exec --workspace photos -- next build --webpack",
"build:share": "npm run build:wasm && npm exec --workspace share -- next build --webpack && npm run build:post --workspace share",
"build:space": "npm run build: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 -- --no-pack",
"build:twoof3": "npm exec --workspace twoof3 -- next build --webpack",
- "build:wasm": "npm run build --workspace ente-wasm -- --no-pack && npm run build --workspace ente-wasm-core -- --no-pack",
+ "build:wasm": "npm run build --workspace ente-core-wasm -- --no-pack",
"dev": "npm run dev:photos",
"dev:accounts": "npm run build:wasm && npm exec --workspace accounts -- next dev --webpack -p 3001",
"dev:albums": "npm run build:wasm && npm exec --workspace albums -- next dev --webpack -p 3002",
@@ -38,7 +38,7 @@
"dev:legacy": "npm run build:wasm && npm exec --workspace legacy -- next dev --webpack -p 3011",
"dev:locker": "npm run build:wasm && npm exec --workspace locker -- next dev --webpack -p 3009",
"dev:memories": "npm run build:wasm && npm exec --workspace memories -- next dev --webpack -p 3010",
- "dev:paste": "npm run build:wasm && npm exec --workspace paste -- next dev --webpack -p 3008",
+ "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:wasm && npm run build:cast-wasm && npm exec --workspace photos -- next dev --webpack -p 3000",
"dev:share": "npm run build:wasm && npm exec --workspace share -- next dev --webpack -p 3005",
@@ -46,7 +46,7 @@
"dev:twoof3": "npm exec --workspace twoof3 -- next dev --webpack -p 3012",
"lint": "concurrently --names 'prettier,eslint,tsc' \"prettier --check --log-level warn .\" \"npm exec --workspaces -- eslint --max-warnings 0\" \"npm exec --workspaces -- tsc\"",
"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-wasm && npm run test --workspace ente-contacts-web && npm run test --workspace photos"
+ "test": "npm run test --workspace ente-core-wasm && npm run test --workspace ente-paste-wasm && npm run test --workspace ente-contacts-web && npm run test --workspace photos"
},
"overrides": {
"@types/react": "19.2.17",
diff --git a/web/packages/accounts/README.md b/web/packages/accounts/README.md
deleted file mode 100644
index 76c7951ce0..0000000000
--- a/web/packages/accounts/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## ente-accounts
-
-Shared web account flows backed by Rust cryptography through `ente-wasm`.
diff --git a/web/packages/accounts/package.json b/web/packages/accounts/package.json
index 65686dc1bc..caff688642 100644
--- a/web/packages/accounts/package.json
+++ b/web/packages/accounts/package.json
@@ -5,7 +5,7 @@
"dependencies": {
"comlink": "4.4.2",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"react": "19.2.7",
"react-dom": "19.2.7",
"react-otp-input": "3.1.1",
diff --git a/web/packages/accounts/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.ts
index f8b50e44f8..38ca8dfb7d 100644
--- a/web/packages/accounts/services/crypto/index.ts
+++ b/web/packages/accounts/services/crypto/index.ts
@@ -1,7 +1,7 @@
import type { Remote } from "comlink";
import { inWorker } from "ente-base/env";
import { ComlinkWorker } from "ente-base/worker/comlink-worker";
-import { loadCryptoReadyEnteWasm } from "ente-wasm/load";
+import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
import type { DerivedKey } from "./kdf";
import * as kdf from "./kdf";
import type { KDFWorker } from "./kdf.worker";
diff --git a/web/packages/accounts/services/crypto/kdf.ts b/web/packages/accounts/services/crypto/kdf.ts
index 8a75355be6..083eae49b5 100644
--- a/web/packages/accounts/services/crypto/kdf.ts
+++ b/web/packages/accounts/services/crypto/kdf.ts
@@ -1,4 +1,4 @@
-import { loadCryptoReadyEnteWasm } from "ente-wasm/load";
+import { loadCryptoReadyEnteWasm } from "ente-core-wasm/load";
export const deriveKeyInsufficientMemoryErrorMessage =
"Failed to derive key (insufficient memory)";
diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.ts
index 2a1a0814c4..b02c64bb9d 100644
--- a/web/packages/accounts/services/srp.ts
+++ b/web/packages/accounts/services/srp.ts
@@ -9,8 +9,8 @@ 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 { loadEnteWasm } from "ente-wasm/load";
import { v4 as uuidv4 } from "uuid";
import { z } from "zod";
import { saveSRPAttributes } from "./accounts-db";
diff --git a/web/packages/base/next.config.base.js b/web/packages/base/next.config.base.js
index 1d58faf9f3..4f72341046 100644
--- a/web/packages/base/next.config.base.js
+++ b/web/packages/base/next.config.base.js
@@ -71,7 +71,13 @@ const nextConfig = {
output: "export",
devIndicators: false,
compiler: { emotion: true },
- transpilePackages: ["ente-base", "ente-utils", "ente-new", "ente-wasm"],
+ transpilePackages: [
+ "ente-base",
+ "ente-utils",
+ "ente-new",
+ "ente-core-wasm",
+ "ente-paste-wasm",
+ ],
env: { gitSHA, appName, isDesktop, desktopAppVersion },
diff --git a/web/packages/contacts/index.test.ts b/web/packages/contacts/index.test.ts
index a95b3358c9..d9541189f6 100644
--- a/web/packages/contacts/index.test.ts
+++ b/web/packages/contacts/index.test.ts
@@ -163,7 +163,7 @@ const setupContactsModule = async (options: SetupOptions = {}) => {
desktopAppVersion: undefined,
isDesktop: false,
}));
- vi.doMock("ente-wasm", () => ({
+ vi.doMock("ente-core-wasm", () => ({
contacts_open_ctx: vi.fn(() => ({
ctx: {
update_auth_token,
diff --git a/web/packages/contacts/index.ts b/web/packages/contacts/index.ts
index 2a5779a2c2..332a50e0f1 100644
--- a/web/packages/contacts/index.ts
+++ b/web/packages/contacts/index.ts
@@ -8,8 +8,8 @@ import { retryAsyncOperation } from "ente-base/http";
import log from "ente-base/log";
import { apiOrigin } from "ente-base/origins";
import { savedAuthToken } from "ente-base/token";
-import type { ContactsCtxHandle } from "ente-wasm";
-import { loadEnteWasm } from "ente-wasm/load";
+import type { ContactsCtxHandle } from "ente-core-wasm";
+import { loadEnteWasm } from "ente-core-wasm/load";
import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react";
import {
saveContactDisplayRecords,
diff --git a/web/packages/contacts/package.json b/web/packages/contacts/package.json
index 4bbac33ffc..10ad3bec80 100644
--- a/web/packages/contacts/package.json
+++ b/web/packages/contacts/package.json
@@ -12,7 +12,7 @@
"@mui/material": "9.3.1",
"ente-accounts": "*",
"ente-base": "*",
- "ente-wasm": "*",
+ "ente-core-wasm": "*",
"react": "19.2.7",
"zod": "4.4.3"
},
diff --git a/web/packages/wasm-core/blob.ts b/web/packages/wasm-core/blob.ts
deleted file mode 100644
index 81aa5702af..0000000000
--- a/web/packages/wasm-core/blob.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { loadWasmCore } from "./load";
-import { Header, Key } from "./types";
-
-export interface EncryptedBlob {
- encryptedData: Uint8Array;
- decryptionHeader: Header;
-}
-
-export const blobEncrypt = async (
- data: Uint8Array,
- key: Key,
-): Promise<EncryptedBlob> => {
- const wasm = await loadWasmCore();
- const blob = wasm.blobEncrypt(data, key.bytes);
- try {
- return {
- encryptedData: blob.encryptedData,
- decryptionHeader: Header.fromBytes(blob.decryptionHeader),
- };
- } finally {
- blob.free();
- }
-};
-
-export const blobDecrypt = async (
- data: Uint8Array,
- header: Header,
- key: Key,
-): Promise<Uint8Array> => {
- const wasm = await loadWasmCore();
- return wasm.blobDecrypt(data, header.bytes, key.bytes);
-};
-
-export const blobEncryptCombined = async (
- data: Uint8Array,
- key: Key,
-): Promise<Uint8Array> => {
- const wasm = await loadWasmCore();
- return wasm.blobEncryptCombined(data, key.bytes);
-};
-
-export const blobDecryptCombined = async (
- data: Uint8Array,
- key: Key,
-): Promise<Uint8Array> => {
- const wasm = await loadWasmCore();
- return wasm.blobDecryptCombined(data, key.bytes);
-};
diff --git a/web/packages/wasm-core/index.ts b/web/packages/wasm-core/index.ts
deleted file mode 100644
index 825b9e31a6..0000000000
--- a/web/packages/wasm-core/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// The wrappers in this package load the wasm module lazily, but the wasm
-// calls themselves run synchronously on the calling thread. Invoke heavy
-// operations from a Web Worker to avoid freezing the UI.
-export * from "./blob";
-export * from "./secretbox";
-export * from "./types";
diff --git a/web/packages/wasm-core/load.ts b/web/packages/wasm-core/load.ts
deleted file mode 100644
index bedda0f40d..0000000000
--- a/web/packages/wasm-core/load.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const loadWasmCore = () => import("./pkg/ente_wasm_core");
diff --git a/web/packages/wasm-core/package.json b/web/packages/wasm-core/package.json
deleted file mode 100644
index 143cef7c73..0000000000
--- a/web/packages/wasm-core/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "ente-wasm-core",
- "version": "0.0.0",
- "private": true,
- "exports": {
- ".": {
- "types": "./index.ts",
- "import": "./index.ts"
- }
- },
- "scripts": {
- "build": "wasm-pack build ../../../rust/bindings/wasm/core --target bundler --out-dir ../../../../web/packages/wasm-core/pkg"
- },
- "devDependencies": {
- "ente-build-config": "*",
- "wasm-pack": "0.15.0"
- }
-}
diff --git a/web/packages/wasm-core/secretbox.ts b/web/packages/wasm-core/secretbox.ts
deleted file mode 100644
index 70fe1cfed5..0000000000
--- a/web/packages/wasm-core/secretbox.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { loadWasmCore } from "./load";
-import { Key, Nonce } from "./types";
-
-export interface EncryptedBox {
- encryptedData: Uint8Array;
- nonce: Nonce;
-}
-
-export const secretboxEncrypt = async (
- data: Uint8Array,
- key: Key,
-): Promise<EncryptedBox> => {
- const wasm = await loadWasmCore();
- const box = wasm.secretboxEncrypt(data, key.bytes);
- try {
- return {
- encryptedData: box.encryptedData,
- nonce: Nonce.fromBytes(box.nonce),
- };
- } finally {
- box.free();
- }
-};
-
-export const secretboxDecrypt = async (
- data: Uint8Array,
- nonce: Nonce,
- key: Key,
-): Promise<Uint8Array> => {
- const wasm = await loadWasmCore();
- return wasm.secretboxDecrypt(data, nonce.bytes, key.bytes);
-};
-
-export const secretboxEncryptCombined = async (
- data: Uint8Array,
- key: Key,
-): Promise<Uint8Array> => {
- const wasm = await loadWasmCore();
- return wasm.secretboxEncryptCombined(data, key.bytes);
-};
-
-export const secretboxDecryptCombined = async (
- data: Uint8Array,
- key: Key,
-): Promise<Uint8Array> => {
- const wasm = await loadWasmCore();
- return wasm.secretboxDecryptCombined(data, key.bytes);
-};
diff --git a/web/packages/wasm-core/types.ts b/web/packages/wasm-core/types.ts
deleted file mode 100644
index 7a9a49a187..0000000000
--- a/web/packages/wasm-core/types.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-const sized = (bytes: Uint8Array, length: number, name: string): Uint8Array => {
- if (bytes.length !== length) {
- throw new Error(
- `${name} must be ${length} bytes, but got ${bytes.length}`,
- );
- }
- return bytes;
-};
-
-export class Key {
- private constructor(private readonly _bytes: Uint8Array) {}
-
- static fromBytes(bytes: Uint8Array): Key {
- return new Key(sized(bytes, 32, "Key"));
- }
-
- get bytes(): Uint8Array {
- return this._bytes;
- }
-}
-
-export class Nonce {
- private constructor(private readonly _bytes: Uint8Array) {}
-
- static fromBytes(bytes: Uint8Array): Nonce {
- return new Nonce(sized(bytes, 24, "Nonce"));
- }
-
- get bytes(): Uint8Array {
- return this._bytes;
- }
-}
-
-export class Salt {
- private constructor(private readonly _bytes: Uint8Array) {}
-
- static fromBytes(bytes: Uint8Array): Salt {
- return new Salt(sized(bytes, 16, "Salt"));
- }
-
- get bytes(): Uint8Array {
- return this._bytes;
- }
-}
-
-export class Header {
- private constructor(private readonly _bytes: Uint8Array) {}
-
- static fromBytes(bytes: Uint8Array): Header {
- return new Header(sized(bytes, 24, "Header"));
- }
-
- get bytes(): Uint8Array {
- return this._bytes;
- }
-}
-
-export class PublicKey {
- private constructor(private readonly _bytes: Uint8Array) {}
-
- static fromBytes(bytes: Uint8Array): PublicKey {
- return new PublicKey(sized(bytes, 32, "PublicKey"));
- }
-
- get bytes(): Uint8Array {
- return this._bytes;
- }
-}
-
-export class SecretKey {
- private constructor(private readonly _bytes: Uint8Array) {}
-
- static fromBytes(bytes: Uint8Array): SecretKey {
- return new SecretKey(sized(bytes, 32, "SecretKey"));
- }
-
- get bytes(): Uint8Array {
- return this._bytes;
- }
-}
diff --git a/web/packages/wasm-core/eslint.config.mjs b/web/packages/wasm/core/eslint.config.mjs
similarity index 100%
rename from web/packages/wasm-core/eslint.config.mjs
rename to web/packages/wasm/core/eslint.config.mjs
diff --git a/web/packages/wasm/load.test.ts b/web/packages/wasm/core/load.test.ts
similarity index 93%
rename from web/packages/wasm/load.test.ts
rename to web/packages/wasm/core/load.test.ts
index 413b35c39c..ef84b7e5a4 100644
--- a/web/packages/wasm/load.test.ts
+++ b/web/packages/wasm/core/load.test.ts
@@ -8,7 +8,7 @@ afterEach(() => {
test("loadEnteWasm shares the same import promise", async () => {
const wasmModule = { crypto_init: vi.fn() };
const importFactory = vi.fn(() => Promise.resolve(wasmModule));
- vi.doMock("ente-wasm", importFactory);
+ vi.doMock("ente-core-wasm", importFactory);
const { loadEnteWasm } = await import("./load");
@@ -29,7 +29,7 @@ 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-wasm", importFactory);
+ vi.doMock("ente-core-wasm", importFactory);
const { loadCryptoReadyEnteWasm } = await import("./load");
@@ -54,7 +54,7 @@ test("loadCryptoReadyEnteWasm retries after crypto init failure", async () => {
}
});
const wasmModule = { crypto_init };
- vi.doMock("ente-wasm", () => wasmModule);
+ vi.doMock("ente-core-wasm", () => wasmModule);
const { loadCryptoReadyEnteWasm } = await import("./load");
@@ -68,7 +68,7 @@ test("loadCryptoReadyEnteWasm retries after crypto init failure", async () => {
test("loadEnteWasm retries after a failed load attempt", async () => {
const wasmModule = { crypto_init: vi.fn() };
let attempts = 0;
- vi.doMock("ente-wasm", () => {
+ vi.doMock("ente-core-wasm", () => {
attempts += 1;
if (attempts === 1) {
throw new Error("import failed");
diff --git a/web/packages/wasm/load.ts b/web/packages/wasm/core/load.ts
similarity index 81%
rename from web/packages/wasm/load.ts
rename to web/packages/wasm/core/load.ts
index 93f5dda523..ed0dfba5f1 100644
--- a/web/packages/wasm/load.ts
+++ b/web/packages/wasm/core/load.ts
@@ -1,10 +1,10 @@
-type EnteWasmModule = typeof import("ente-wasm");
+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-wasm").catch((error: unknown) => {
+ (wasmPromise ??= import("ente-core-wasm").catch((error: unknown) => {
wasmPromise = undefined;
throw error;
}));
diff --git a/web/packages/wasm/package.json b/web/packages/wasm/core/package.json
similarity index 54%
rename from web/packages/wasm/package.json
rename to web/packages/wasm/core/package.json
index 66ca47a834..3d3b6fa97b 100644
--- a/web/packages/wasm/package.json
+++ b/web/packages/wasm/core/package.json
@@ -1,21 +1,21 @@
{
- "name": "ente-wasm",
+ "name": "ente-core-wasm",
"version": "0.0.0",
"private": true,
"exports": {
".": {
- "types": "./pkg/ente_wasm.d.ts",
- "import": "./pkg/ente_wasm.js"
+ "types": "./pkg/ente_core_wasm.d.ts",
+ "import": "./pkg/ente_core_wasm.js"
},
"./load": {
"types": "./load.ts",
"import": "./load.ts"
}
},
- "module": "./pkg/ente_wasm.js",
- "types": "./pkg/ente_wasm.d.ts",
+ "module": "./pkg/ente_core_wasm.js",
+ "types": "./pkg/ente_core_wasm.d.ts",
"scripts": {
- "build": "wasm-pack build ../../../rust/bindings/wasm/ente-wasm --target bundler --out-dir ../../../../web/packages/wasm/pkg",
+ "build": "wasm-pack build ../../../../rust/bindings/wasm/core --target bundler --out-dir ../../../../web/packages/wasm/core/pkg",
"test": "vitest --run"
},
"devDependencies": {
diff --git a/web/packages/wasm/tests/auth.test.ts b/web/packages/wasm/core/tests/auth.test.ts
similarity index 98%
rename from web/packages/wasm/tests/auth.test.ts
rename to web/packages/wasm/core/tests/auth.test.ts
index 7f61a5a11b..81ca391fd5 100644
--- a/web/packages/wasm/tests/auth.test.ts
+++ b/web/packages/wasm/core/tests/auth.test.ts
@@ -6,7 +6,7 @@ import {
auth_recovery_key_from_mnemonic_or_hex,
auth_recovery_key_to_mnemonic,
crypto_generate_key,
-} from "../pkg/ente_wasm.js";
+} from "../pkg/ente_core_wasm.js";
test("generates an interactive kek bundle", () => {
const generated = auth_generate_interactive_kek(
diff --git a/web/packages/wasm/tests/contacts.test.ts b/web/packages/wasm/core/tests/contacts.test.ts
similarity index 87%
rename from web/packages/wasm/tests/contacts.test.ts
rename to web/packages/wasm/core/tests/contacts.test.ts
index 4cc4c35b1b..03145dfe96 100644
--- a/web/packages/wasm/tests/contacts.test.ts
+++ b/web/packages/wasm/core/tests/contacts.test.ts
@@ -1,5 +1,5 @@
import { expect, test } from "vitest";
-import { contacts_open_ctx } from "../pkg/ente_wasm.js";
+import { contacts_open_ctx } from "../pkg/ente_core_wasm.js";
test("contacts errors cross as an Error carrying a tagged shape", async () => {
try {
diff --git a/web/packages/wasm/tests/crypto.test.ts b/web/packages/wasm/core/tests/crypto.test.ts
similarity index 96%
rename from web/packages/wasm/tests/crypto.test.ts
rename to web/packages/wasm/core/tests/crypto.test.ts
index 51ba3241c6..898fcf940e 100644
--- a/web/packages/wasm/tests/crypto.test.ts
+++ b/web/packages/wasm/core/tests/crypto.test.ts
@@ -3,7 +3,7 @@ import {
CryptoStreamEncryptor,
crypto_decrypt_blob,
crypto_decrypt_blob_legacy,
-} from "../pkg/ente_wasm.js";
+} from "../pkg/ente_core_wasm.js";
test("strict blob decrypt rejects non-final secretstream payloads", () => {
const encryptor = new CryptoStreamEncryptor();
diff --git a/web/packages/wasm/tests/urls.test.ts b/web/packages/wasm/core/tests/urls.test.ts
similarity index 87%
rename from web/packages/wasm/tests/urls.test.ts
rename to web/packages/wasm/core/tests/urls.test.ts
index 5e16a4b4a5..11d752097a 100644
--- a/web/packages/wasm/tests/urls.test.ts
+++ b/web/packages/wasm/core/tests/urls.test.ts
@@ -1,5 +1,5 @@
import { expect, test } from "vitest";
-import { file_download_url } from "../pkg/ente_wasm.js";
+import { file_download_url } from "../pkg/ente_core_wasm.js";
test("generates CDN URL for production", () => {
const url = file_download_url("https://api.ente.com", BigInt(12345));
diff --git a/web/packages/wasm/tsconfig.json b/web/packages/wasm/core/tsconfig.json
similarity index 100%
rename from web/packages/wasm/tsconfig.json
rename to web/packages/wasm/core/tsconfig.json
diff --git a/web/packages/wasm/vitest.config.ts b/web/packages/wasm/core/vitest.config.ts
similarity index 100%
rename from web/packages/wasm/vitest.config.ts
rename to web/packages/wasm/core/vitest.config.ts
diff --git a/web/packages/wasm/eslint.config.mjs b/web/packages/wasm/eslint.config.mjs
deleted file mode 100644
index fcbcdc9a6c..0000000000
--- a/web/packages/wasm/eslint.config.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import config from "ente-build-config/eslintrc-base.mjs";
-
-export default [...config, { ignores: ["pkg/", "pkg-srp/", "space/"] }];
diff --git a/web/packages/wasm/paste/eslint.config.mjs b/web/packages/wasm/paste/eslint.config.mjs
new file mode 100644
index 0000000000..e6c7d4d3b0
--- /dev/null
+++ b/web/packages/wasm/paste/eslint.config.mjs
@@ -0,0 +1,3 @@
+import config from "ente-build-config/eslintrc-base.mjs";
+
+export default [...config, { ignores: ["pkg/"] }];
diff --git a/web/packages/wasm/paste/index.ts b/web/packages/wasm/paste/index.ts
new file mode 100644
index 0000000000..4d40063de5
--- /dev/null
+++ b/web/packages/wasm/paste/index.ts
@@ -0,0 +1,27 @@
+import { wrap, type Remote } from "comlink";
+import type { PasteWorker } from "./worker";
+
+export type CreatedPaste = Awaited<ReturnType<PasteWorker["create"]>>;
+export type OpenedPaste = Awaited<ReturnType<PasteWorker["open"]>>;
+
+export class PasteClient {
+ private constructor(
+ private worker: Worker,
+ private remote: Remote<PasteWorker>,
+ ) {}
+
+ static async init(apiOrigin: string) {
+ const worker = new Worker(new URL("worker.ts", import.meta.url));
+ const RemoteWorker = wrap<typeof PasteWorker>(worker);
+ return new PasteClient(worker, await new RemoteWorker(apiOrigin));
+ }
+
+ create = (pasteOrigin: string, text: string, password?: string) =>
+ this.remote.create(pasteOrigin, text, password);
+
+ open = (url: string) => this.remote.open(url);
+
+ submitPassword = (password: string) => this.remote.submitPassword(password);
+
+ terminate = () => this.worker.terminate();
+}
diff --git a/web/packages/wasm/paste/package.json b/web/packages/wasm/paste/package.json
new file mode 100644
index 0000000000..ed790ac893
--- /dev/null
+++ b/web/packages/wasm/paste/package.json
@@ -0,0 +1,26 @@
+{
+ "name": "ente-paste-wasm",
+ "version": "0.0.0",
+ "private": true,
+ "exports": {
+ ".": {
+ "types": "./index.ts",
+ "import": "./index.ts"
+ }
+ },
+ "module": "./index.ts",
+ "types": "./index.ts",
+ "scripts": {
+ "build": "wasm-pack build ../../../../rust/bindings/wasm/paste --target bundler --out-dir ../../../../web/packages/wasm/paste/pkg",
+ "test": "vitest --run"
+ },
+ "dependencies": {
+ "comlink": "4.4.2"
+ },
+ "devDependencies": {
+ "ente-build-config": "*",
+ "vite-plugin-wasm": "3.6.0",
+ "vitest": "4.1.8",
+ "wasm-pack": "0.15.0"
+ }
+}
diff --git a/web/packages/wasm/paste/tests/paste.test.ts b/web/packages/wasm/paste/tests/paste.test.ts
new file mode 100644
index 0000000000..fd0aa50f45
--- /dev/null
+++ b/web/packages/wasm/paste/tests/paste.test.ts
@@ -0,0 +1,13 @@
+import { expect, test } from "vitest";
+import { PasteClient } from "../pkg/ente_paste_wasm.js";
+
+test("returns tagged paste errors", async () => {
+ const client = new PasteClient("http://localhost");
+ await expect(client.create("http://localhost", "")).rejects.toMatchObject({
+ name: "empty_text",
+ });
+ await expect(client.open("http://localhost/ABC123")).rejects.toMatchObject({
+ name: "missing_key",
+ });
+ client.free();
+});
diff --git a/web/packages/wasm-core/tsconfig.json b/web/packages/wasm/paste/tsconfig.json
similarity index 100%
rename from web/packages/wasm-core/tsconfig.json
rename to web/packages/wasm/paste/tsconfig.json
diff --git a/web/packages/wasm/paste/vitest.config.ts b/web/packages/wasm/paste/vitest.config.ts
new file mode 100644
index 0000000000..0b2f1a1c24
--- /dev/null
+++ b/web/packages/wasm/paste/vitest.config.ts
@@ -0,0 +1,5 @@
+import type { PluginOption } from "vite";
+import wasm from "vite-plugin-wasm";
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({ plugins: [wasm() as PluginOption] });
diff --git a/web/packages/wasm/paste/worker.ts b/web/packages/wasm/paste/worker.ts
new file mode 100644
index 0000000000..d50e15b4c8
--- /dev/null
+++ b/web/packages/wasm/paste/worker.ts
@@ -0,0 +1,39 @@
+import { expose } from "comlink";
+import type { PasteClient as WasmPasteClient } from "./pkg/ente_paste_wasm";
+
+export class PasteWorker {
+ private client: Promise<WasmPasteClient>;
+
+ constructor(apiOrigin: string) {
+ this.client = import("./pkg/ente_paste_wasm").then(
+ ({ PasteClient }) => new PasteClient(apiOrigin),
+ );
+ }
+
+ async create(pasteOrigin: string, text: string, password?: string) {
+ const paste = await (
+ await this.client
+ ).create(pasteOrigin, text, password);
+ try {
+ return { url: paste.url, passwordRequired: paste.passwordRequired };
+ } finally {
+ paste.free();
+ }
+ }
+
+ async open(url: string) {
+ const paste = await (await this.client).open(url);
+ try {
+ return paste.passwordRequired
+ ? { passwordRequired: true as const }
+ : { passwordRequired: false as const, text: paste.text! };
+ } finally {
+ paste.free();
+ }
+ }
+
+ submitPassword = async (password: string) =>
+ (await this.client).submitPassword(password);
+}
+
+expose(PasteWorker);