A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: handle attachment errors on export
Abdullah Atta9fa256be0e5e
diff --git a/apps/web/src/utils/streams/export-stream.ts b/apps/web/src/utils/streams/export-stream.tsindex e61e6a15f..9263929e4 100644--- a/apps/web/src/utils/streams/export-stream.ts+++ b/apps/web/src/utils/streams/export-stream.ts@@ -38,26 +38,33 @@ export class ExportStream extends TransformStream<return;}if (item.type === "attachment") {- report({ text: `Downloading attachment: ${item.path}` });- await db- .fs()- .downloadFile("exports", item.data.hash, item.data.chunkSize);- const key = await db.attachments.decryptKey(item.data.key);- if (!key) return;- const stream = await streamingDecryptFile(item.data.hash, {- key,- iv: item.data.iv,- name: item.data.filename,- type: item.data.mimeType,- isUploaded: !!item.data.dateUploaded- });+ try {+ report({ text: `Downloading attachment: ${item.path}` });+ await db+ .fs()+ .downloadFile("exports", item.data.hash, item.data.chunkSize);+ const key = await db.attachments.decryptKey(item.data.key);+ if (!key) return;+ const stream = await streamingDecryptFile(item.data.hash, {+ key,+ iv: item.data.iv,+ name: item.data.filename,+ type: item.data.mimeType,+ isUploaded: !!item.data.dateUploaded+ });- if (!stream) return;- controller.enqueue({ ...item, data: stream });- report({- current: this.progress++,- text: `Saving attachment: ${item.path}`- });+ if (!stream) return;+ controller.enqueue({ ...item, data: stream });+ report({+ current: this.progress++,+ text: `Saving attachment: ${item.path}`+ });+ } catch (e) {+ if (e instanceof Error) {+ e.message = `Failed to export attachment: ${item.path}. ${e.message}`;+ handleError(e);+ }+ }} else {controller.enqueue(item);report({