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: compare uploaded file size with actual file size after upload
Abdullah Attaefbc566386a4
diff --git a/apps/web/src/common/attachments.ts b/apps/web/src/common/attachments.tsindex 08502c7fe..0bbf623ab 100644--- a/apps/web/src/common/attachments.ts+++ b/apps/web/src/common/attachments.ts@@ -116,12 +116,10 @@ export async function checkAttachment(hash: string) {if (!attachment) return { failed: "Attachment not found." };try {- const size = await lazify(- import("../interfaces/fs"),- ({ getUploadedFileSize }) => getUploadedFileSize(hash)+ await lazify(import("../interfaces/fs"), ({ checkUpload }) =>+ checkUpload(hash, attachment.chunkSize, attachment.size));- if (size === 0) throw new Error("File length is 0.");- else if (size === -1) throw new Error("File verification check failed.");+ await db.attachments.markAsFailed(attachment.id);} catch (e) {const reason = e instanceof Error ? e.message : "Unknown error.";await db.attachments.markAsFailed(attachment.id, reason);diff --git a/apps/web/src/interfaces/fs.ts b/apps/web/src/interfaces/fs.tsindex 31862fad8..889825ca3 100644--- a/apps/web/src/interfaces/fs.ts+++ b/apps/web/src/interfaces/fs.ts@@ -256,7 +256,11 @@ async function uploadFile(: await multiPartUploadFile(fileHandle, filename, requestOptions);if (uploaded) {- await checkUpload(filename);+ await checkUpload(+ filename,+ requestOptions.chunkSize,+ fileHandle.file.size+ );await fileHandle.addAdditionalData("uploaded", true);}@@ -448,13 +452,21 @@ async function resetUpload(fileHandle: FileHandle) {await fileHandle.addAdditionalData("uploaded", false);}-async function checkUpload(filename: string) {+export async function checkUpload(+ filename: string,+ chunkSize: number,+ expectedSize: number+) {const size = await getUploadedFileSize(filename);+ const totalChunks = Math.ceil(size / chunkSize);+ const decryptedLength = size - totalChunks * ABYTES;const error =size === 0- ? `Upload verification failed: file size is 0. Please upload this file again. (File hash: ${filename})`+ ? `File size is 0.`: size === -1- ? `Upload verification failed.`+ ? `File verification check failed.`+ : expectedSize !== decryptedLength+ ? `File size mismatch. Expected ${size} bytes but got ${decryptedLength} bytes.`: undefined;if (error) throw new Error(error);}