π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Move Cast sender binding into Photos WASM
Manav Rathi293677acb7f3
diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 6ee03523f0..232237abb2 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2814,7 +2814,13 @@ dependencies = [name = "ente-photos-wasm"version = "0.0.0"dependencies = [+ "ente-cast","ente-wasm-lib",+ "serde",+ "serde-wasm-bindgen",+ "thiserror 2.0.18",+ "tsify",+ "wasm-bindgen",][[package]]diff --git a/rust/bindings/wasm/cast/src/lib.rs b/rust/bindings/wasm/cast/src/lib.rsindex 704788c516..affa7da4e9 100644--- a/rust/bindings/wasm/cast/src/lib.rs+++ b/rust/bindings/wasm/cast/src/lib.rs@@ -72,31 +72,3 @@ pub struct CastPayload {cast_token: String,collection_key: String,}--#[derive(Serialize, Tsify)]-#[serde(rename_all = "camelCase")]-pub struct PreparedCastPayload {- cast_token: String,- encrypted_payload: String,-}--#[wasm_bindgen(js_name = preparePayload)]-pub fn prepare_payload(- public_key: &str,- pq_public_key: Option<String>,- collection_id: i64,- collection_key: &str,-) -> Result<<PreparedCastPayload as Tsify>::JsType, Error> {- let payload = ente_cast::prepare_payload(- public_key,- pq_public_key.as_deref(),- collection_id,- collection_key,- )?;- PreparedCastPayload {- cast_token: payload.cast_token,- encrypted_payload: payload.encrypted_payload,- }- .into_js()- .map_err(Into::into)-}diff --git a/rust/bindings/wasm/photos/Cargo.toml b/rust/bindings/wasm/photos/Cargo.tomlindex f507b9bcc3..1897ee993b 100644--- a/rust/bindings/wasm/photos/Cargo.toml+++ b/rust/bindings/wasm/photos/Cargo.toml@@ -6,7 +6,13 @@ edition.workspace = truecrate-type = ["cdylib"][dependencies]+ente-cast.workspace = trueente-wasm-lib = { workspace = true, features = ["collections", "contacts", "crypto"] }+serde.workspace = true+serde-wasm-bindgen.workspace = true+thiserror.workspace = true+tsify.workspace = true+wasm-bindgen.workspace = true[lints]workspace = truediff --git a/rust/bindings/wasm/photos/src/lib.rs b/rust/bindings/wasm/photos/src/lib.rsindex 786e389426..82c61eb8b0 100644--- a/rust/bindings/wasm/photos/src/lib.rs+++ b/rust/bindings/wasm/photos/src/lib.rs@@ -1 +1,46 @@-use ente_wasm_lib as _;+use serde::Serialize;+use serde_wasm_bindgen as swb;+use tsify::Tsify;+use wasm_bindgen::prelude::*;++#[derive(Debug, thiserror::Error)]+pub enum Error {+ #[error(transparent)]+ Cast(#[from] ente_cast::Error),+ #[error(transparent)]+ Serde(#[from] swb::Error),+}++impl From<Error> for JsValue {+ fn from(error: Error) -> Self {+ ente_wasm_lib::js_error(&error, None)+ }+}++#[derive(Serialize, Tsify)]+#[serde(rename_all = "camelCase")]+pub struct PreparedCastPayload {+ cast_token: String,+ encrypted_payload: String,+}++#[wasm_bindgen(js_name = preparePayload)]+pub fn prepare_payload(+ public_key: &str,+ pq_public_key: Option<String>,+ collection_id: i64,+ collection_key: &str,+) -> Result<<PreparedCastPayload as Tsify>::JsType, Error> {+ let payload = ente_cast::prepare_payload(+ public_key,+ pq_public_key.as_deref(),+ collection_id,+ collection_key,+ )?;+ PreparedCastPayload {+ cast_token: payload.cast_token,+ encrypted_payload: payload.encrypted_payload,+ }+ .into_js()+ .map_err(Into::into)+}diff --git a/web/apps/photos/package.json b/web/apps/photos/package.jsonindex a5788f1fde..3f0e70ef39 100644--- a/web/apps/photos/package.json+++ b/web/apps/photos/package.json@@ -15,7 +15,6 @@"debounce": "2.2.0","ente-accounts": "*","ente-base": "*",- "ente-cast-wasm": "*","ente-contacts": "*","ente-gallery": "*","ente-media": "*",diff --git a/web/apps/photos/src/services/cast.ts b/web/apps/photos/src/services/cast.tsindex 462085cd46..73d97e6b67 100644--- a/web/apps/photos/src/services/cast.ts+++ b/web/apps/photos/src/services/cast.ts@@ -1,8 +1,8 @@import { namedError } from "ente-base/error";import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";import { apiURL } from "ente-base/origins";-import { prepareCastPayload } from "ente-cast-wasm";import type { Collection } from "ente-media/collection";+import { prepareCastPayload } from "ente-photos-wasm";import { z } from "zod";export const revokeAllCastTokens = async () =>diff --git a/web/package-lock.json b/web/package-lock.jsonindex 5ac2f8c4a5..dea040228b 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -297,7 +297,6 @@"debounce": "2.2.0","ente-accounts": "*","ente-base": "*",- "ente-cast-wasm": "*","ente-contacts": "*","ente-gallery": "*","ente-media": "*",diff --git a/web/package.json b/web/package.jsonindex a4fd0f446b..46051635e8 100644--- a/web/package.json+++ b/web/package.json@@ -26,7 +26,7 @@"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:prelogin-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:photos-wasm && npm exec --workspace photos -- next build --webpack","build:photos-wasm": "npm run build --workspace ente-photos-wasm","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",@@ -46,7 +46,7 @@"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:prelogin-wasm && npm run build:cast-wasm && npm run build:photos-wasm && npm exec --workspace photos -- next dev --webpack -p 3000",+ "dev:photos": "npm run build:prelogin-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",diff --git a/web/packages/wasm/cast/index.ts b/web/packages/wasm/cast/index.tsindex eea5e4481c..a3acaf45e0 100644--- a/web/packages/wasm/cast/index.ts+++ b/web/packages/wasm/cast/index.ts@@ -11,16 +11,3 @@ export const openCastPayload = (receiver: CastReceiver,encryptedPayload: string,) => receiver.openPayload(encryptedPayload);--export const prepareCastPayload = async (- publicKey: string,- pqPublicKey: string | undefined,- collectionID: number,- collectionKey: string,-) =>- (await wasm()).preparePayload(- publicKey,- pqPublicKey,- BigInt(collectionID),- collectionKey,- );diff --git a/web/packages/wasm/photos/index.ts b/web/packages/wasm/photos/index.tsindex df3525129c..24b46ca3c9 100644--- a/web/packages/wasm/photos/index.ts+++ b/web/packages/wasm/photos/index.ts@@ -61,3 +61,16 @@ export const openCollectionKey = async (encryptedKey,keyDecryptionNonce,);++export const prepareCastPayload = async (+ publicKey: string,+ pqPublicKey: string | undefined,+ collectionID: number,+ collectionKey: string,+) =>+ (await wasm()).preparePayload(+ publicKey,+ pqPublicKey,+ BigInt(collectionID),+ collectionKey,+ );diff --git a/web/packages/wasm/tests/bindings.test.ts b/web/packages/wasm/tests/bindings.test.tsindex 7c59902e9a..e267dc4e13 100644--- a/web/packages/wasm/tests/bindings.test.ts+++ b/web/packages/wasm/tests/bindings.test.ts@@ -14,35 +14,40 @@ import { lockerPrepareFileLinkPayload } from "../locker/pkg/ente_locker_wasm";afterEach(() => vi.unstubAllGlobals());-test("Cast rejects collection IDs outside JavaScript's safe integer range", async () => {- const receiver = await cast.createCastReceiver();- const collectionKey = await generateKey();- try {- for (const collectionID of [- Number.MAX_SAFE_INTEGER,- Number.MAX_SAFE_INTEGER + 1,- ]) {- const { castToken, encryptedPayload } =- await cast.prepareCastPayload(- receiver.publicKey,- undefined,- collectionID,- collectionKey,- );- if (Number.isSafeInteger(collectionID)) {- expect(- cast.openCastPayload(receiver, encryptedPayload),- ).toStrictEqual({ castToken, collectionID, collectionKey });- } else {- expect(() =>- cast.openCastPayload(receiver, encryptedPayload),- ).toThrow(Error);+test.each(["classical", "post-quantum"])(+ "Photos %s Cast payloads round-trip and enforce safe collection IDs",+ async (encryption) => {+ const receiver = await cast.createCastReceiver();+ const collectionKey = await generateKey();+ try {+ for (const collectionID of [+ Number.MAX_SAFE_INTEGER,+ Number.MAX_SAFE_INTEGER + 1,+ ]) {+ const { castToken, encryptedPayload } =+ await photos.prepareCastPayload(+ receiver.publicKey,+ encryption === "post-quantum"+ ? receiver.pqPublicKey+ : undefined,+ collectionID,+ collectionKey,+ );+ if (Number.isSafeInteger(collectionID)) {+ expect(+ cast.openCastPayload(receiver, encryptedPayload),+ ).toStrictEqual({ castToken, collectionID, collectionKey });+ } else {+ expect(() =>+ cast.openCastPayload(receiver, encryptedPayload),+ ).toThrow(Error);+ }}+ } finally {+ receiver.free();}- } finally {- receiver.free();- }-});+ },+);for (const [name, api] of [["Photos", photos],