π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Reuse WASM result cleanup in Ensu and Paste
Manav Rathi897e2ef42c77
diff --git a/web/package-lock.json b/web/package-lock.jsonindex 5830a5b64e..e805ad3f72 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -11376,6 +11376,9 @@"packages/wasm/ensu": {"name": "ente-ensu-wasm","version": "0.0.0",+ "dependencies": {+ "ente-utils": "*"+ },"devDependencies": {"ente-build-config": "*","wasm-pack": "0.15.0"@@ -11406,7 +11409,8 @@"name": "ente-paste-wasm","version": "0.0.0","dependencies": {- "comlink": "4.4.2"+ "comlink": "4.4.2",+ "ente-utils": "*"},"devDependencies": {"ente-build-config": "*",diff --git a/web/packages/wasm/ensu/index.ts b/web/packages/wasm/ensu/index.tsindex 2e2a31358a..6afe99e246 100644--- a/web/packages/wasm/ensu/index.ts+++ b/web/packages/wasm/ensu/index.ts@@ -1,15 +1,17 @@+import { readAndFree } from "ente-utils/wasm";+const wasm = () => import("./pkg/ente_ensu_wasm");export const generateChatKey = async () => (await wasm()).generateChatKey();-export const encryptChatPayload = async (value: string, keyB64: string) => {- const payload = (await wasm()).encryptChatPayload(value, keyB64);- try {- return { encryptedData: payload.encryptedData, header: payload.header };- } finally {- payload.free();- }-};+export const encryptChatPayload = async (value: string, keyB64: string) =>+ readAndFree(+ (await wasm()).encryptChatPayload(value, keyB64),+ (payload) => ({+ encryptedData: payload.encryptedData,+ header: payload.header,+ }),+ );export const decryptChatPayload = async (encryptedDataB64: string,diff --git a/web/packages/wasm/ensu/package.json b/web/packages/wasm/ensu/package.jsonindex ec1758c95e..9d2d6785ca 100644--- a/web/packages/wasm/ensu/package.json+++ b/web/packages/wasm/ensu/package.json@@ -13,6 +13,9 @@"scripts": {"build": "wasm-pack build ../../../../rust/bindings/wasm/ensu --target bundler --out-dir ../../../../web/packages/wasm/ensu/pkg --no-pack"},+ "dependencies": {+ "ente-utils": "*"+ },"devDependencies": {"ente-build-config": "*","wasm-pack": "0.15.0"diff --git a/web/packages/wasm/paste/package.json b/web/packages/wasm/paste/package.jsonindex 72d4c3b470..7c9d24dc24 100644--- a/web/packages/wasm/paste/package.json+++ b/web/packages/wasm/paste/package.json@@ -15,7 +15,8 @@"test": "vitest --run"},"dependencies": {- "comlink": "4.4.2"+ "comlink": "4.4.2",+ "ente-utils": "*"},"devDependencies": {"ente-build-config": "*",diff --git a/web/packages/wasm/paste/worker.ts b/web/packages/wasm/paste/worker.tsindex d50e15b4c8..65aa6362e1 100644--- a/web/packages/wasm/paste/worker.ts+++ b/web/packages/wasm/paste/worker.ts@@ -1,4 +1,5 @@import { expose } from "comlink";+import { readAndFree } from "ente-utils/wasm";import type { PasteClient as WasmPasteClient } from "./pkg/ente_paste_wasm";export class PasteWorker {@@ -11,25 +12,21 @@ export class PasteWorker {}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();- }+ return readAndFree(+ await (await this.client).create(pasteOrigin, text, password),+ (paste) => ({+ url: paste.url,+ passwordRequired: paste.passwordRequired,+ }),+ );}async open(url: string) {- const paste = await (await this.client).open(url);- try {- return paste.passwordRequired+ return readAndFree(await (await this.client).open(url), (paste) =>+ paste.passwordRequired? { passwordRequired: true as const }- : { passwordRequired: false as const, text: paste.text! };- } finally {- paste.free();- }+ : { passwordRequired: false as const, text: paste.text! },+ );}submitPassword = async (password: string) =>