Skip to content

armgit / ente

Public Imported from GitHub
0

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

Remove unused WASM wrapper surfaces

Manav Rathi82f6198f85b8
diff --git a/rust/bindings/wasm/lib/src/crypto/file.rs b/rust/bindings/wasm/lib/src/crypto/file.rs
index 6be990fd9a..16bb34078e 100644
--- a/rust/bindings/wasm/lib/src/crypto/file.rs
+++ b/rust/bindings/wasm/lib/src/crypto/file.rs
@@ -155,8 +155,6 @@ pub struct EncryptedStreamResult {
pub decryption_header: String,
#[wasm_bindgen(readonly, js_name = md5Hash)]
pub md5_hash: String,
- #[wasm_bindgen(readonly)]
- pub key: String,
}
#[wasm_bindgen(js_name = cryptoEncryptStreamWithKey)]
@@ -177,6 +175,5 @@ pub fn crypto_encrypt_stream_with_key(
encrypted_data: b64::encode(&encrypted),
decryption_header: b64::encode(header.as_bytes()),
md5_hash: b64::encode(&md5),
- key: b64::encode(key.as_bytes()),
})
}
diff --git a/web/packages/contacts/legacy/index.ts b/web/packages/contacts/legacy/index.ts
index 7e0b379899..9a3cb90086 100644
--- a/web/packages/contacts/legacy/index.ts
+++ b/web/packages/contacts/legacy/index.ts
@@ -7,10 +7,7 @@ export {
export { mergeLegacySuggestedUsers } from "./suggestions";
export type {
LegacyContactRecord,
- LegacyContactState,
LegacyInfo,
LegacyRecoverySession,
- LegacyRecoveryStatus,
LegacySuggestedUser,
- LegacyUser,
} from "./types";
diff --git a/web/packages/contacts/legacy/types.ts b/web/packages/contacts/legacy/types.ts
index 9c1c246e8d..b208bb77ae 100644
--- a/web/packages/contacts/legacy/types.ts
+++ b/web/packages/contacts/legacy/types.ts
@@ -1,10 +1,7 @@
export type {
LegacyContactRecord,
- LegacyContactState,
LegacyInfo,
LegacyRecoverySession,
- LegacyRecoveryStatus,
- LegacyUser,
} from "ente-legacy-wasm/authenticated";
export interface LegacySuggestedUser {
diff --git a/web/packages/wasm/cast/index.ts b/web/packages/wasm/cast/index.ts
index cf180c329a..889da255a4 100644
--- a/web/packages/wasm/cast/index.ts
+++ b/web/packages/wasm/cast/index.ts
@@ -4,13 +4,13 @@ const wasm = () => import("./pkg/ente_cast_wasm");
export type CastReceiver = import("./pkg/ente_cast_wasm").CastReceiver;
-export interface CastPayload {
+interface CastPayload {
castToken: string;
collectionID: number;
collectionKey: string;
}
-export interface PreparedCastPayload {
+interface PreparedCastPayload {
castToken: string;
encryptedPayload: string;
}
diff --git a/web/packages/wasm/core/index.ts b/web/packages/wasm/core/index.ts
index 8812f8df74..cb51adf029 100644
--- a/web/packages/wasm/core/index.ts
+++ b/web/packages/wasm/core/index.ts
@@ -1,7 +1,6 @@
import { readAndFree } from "ente-utils/wasm";
import type { SrpSession } from "./pkg/ente_core_wasm";
-export type { SrpSession };
export type EncryptedBoxB64 = Awaited<ReturnType<typeof encryptBox>>;
export type KeyPair = Awaited<ReturnType<typeof generateKeyPair>>;
@@ -16,12 +15,12 @@ export interface DerivedKey {
memLimit: number;
}
-export interface EncryptedBox {
+interface EncryptedBox {
encryptedData: BytesOrB64;
nonce: BytesOrB64;
}
-export interface SRPSetupAttributes {
+interface SRPSetupAttributes {
srpSalt: string;
srpVerifier: string;
loginSubKey: string;
diff --git a/web/packages/wasm/legacy/authenticated.ts b/web/packages/wasm/legacy/authenticated.ts
index a2d99657e2..966cb99e31 100644
--- a/web/packages/wasm/legacy/authenticated.ts
+++ b/web/packages/wasm/legacy/authenticated.ts
@@ -6,11 +6,8 @@ import type {
export type {
LegacyContactRecord,
- LegacyContactState,
LegacyInfo,
LegacyRecoverySession,
- LegacyRecoveryStatus,
- LegacyUser,
Session,
} from "./pkg/ente_legacy_wasm";
diff --git a/web/packages/wasm/locker/index.ts b/web/packages/wasm/locker/index.ts
index 76c56394d8..93e6bfab22 100644
--- a/web/packages/wasm/locker/index.ts
+++ b/web/packages/wasm/locker/index.ts
@@ -1,17 +1,6 @@
import { readAndFree } from "ente-utils/wasm";
import type { WrappedRootContactKey } from "./pkg/ente_locker_wasm";
-export type {
- CryptoStreamDecryptor as StreamDecryptorHandle,
- CryptoStreamEncryptor as StreamEncryptorHandle,
-} from "./pkg/ente_locker_wasm";
-
-export type EncryptedBlobB64 = Awaited<ReturnType<typeof encryptBlob>>;
-export type EncryptedBoxB64 = Awaited<ReturnType<typeof encryptBox>>;
-export type EncryptedFileResult = Awaited<
- ReturnType<typeof encryptFileStreamWithKey>
->;
-
interface OpenSessionInput {
baseUrl: string;
authToken: string;
@@ -67,17 +56,17 @@ export const contactsGetProfilePicture = async (
type BytesOrB64 = Uint8Array | string;
-export interface EncryptedBlob {
+interface EncryptedBlob {
encryptedData: BytesOrB64;
decryptionHeader: BytesOrB64;
}
-export interface EncryptedBox {
+interface EncryptedBox {
encryptedData: BytesOrB64;
nonce: BytesOrB64;
}
-export interface KeyPair {
+interface KeyPair {
publicKey: string;
privateKey: string;
}
@@ -176,7 +165,6 @@ export const encryptFileStreamWithKey = async (
encryptedData: file.encryptedData,
decryptionHeader: file.decryptionHeader,
md5Hash: file.md5Hash,
- key: file.key,
}),
);
diff --git a/web/packages/wasm/paste/index.ts b/web/packages/wasm/paste/index.ts
index 4d40063de5..bebe1eb34e 100644
--- a/web/packages/wasm/paste/index.ts
+++ b/web/packages/wasm/paste/index.ts
@@ -1,9 +1,6 @@
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,
diff --git a/web/packages/wasm/space/index.ts b/web/packages/wasm/space/index.ts
index fae0607a36..ea09395daf 100644
--- a/web/packages/wasm/space/index.ts
+++ b/web/packages/wasm/space/index.ts
@@ -5,7 +5,7 @@ export type SpaceAccountCtxHandle =
export type SpaceLinkCtxHandle =
import("./pkg/ente_space_wasm").SpaceLinkCtxHandle;
-export interface OpenSpaceAccountContextInput {
+interface OpenSpaceAccountContextInput {
baseUrl: string;
clientPackage: string;
clientVersion?: string;
@@ -14,7 +14,7 @@ export interface OpenSpaceAccountContextInput {
spaceSessionToken: string;
}
-export interface OpenSpaceLinkContextInput {
+interface OpenSpaceLinkContextInput {
accessKey: string;
baseUrl: string;
clientPackage: string;