π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][photos] Explain blob creation failures during downloads
aspizu92e78980d7d0
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.jsonindex de763a8d7c..bea1a5049a 100644--- a/web/packages/base/locales/en-US/translation.json+++ b/web/packages/base/locales/en-US/translation.json@@ -980,6 +980,7 @@"download_failed": "Download failed","download_failed_network_offline": "Connection lost","download_failed_file_error": "Some files failed",+ "download_failed_blob_creation_failed": "Not enough disk space","retry": "Retry","download_progress": "{{count, number}} / {{total, number}} files","christmas": "Christmas",diff --git a/web/packages/gallery/components/DownloadStatusNotifications.tsx b/web/packages/gallery/components/DownloadStatusNotifications.tsxindex 3d0bc9a638..3b76933103 100644--- a/web/packages/gallery/components/DownloadStatusNotifications.tsx+++ b/web/packages/gallery/components/DownloadStatusNotifications.tsx@@ -129,6 +129,8 @@ export const DownloadStatusNotifications: React.FC<statusText = t("download_failed_network_offline");} else if (group.failureReason === "file_error") {statusText = t("download_failed_file_error");+ } else if (group.failureReason === "blob_creation_failed") {+ statusText = t("download_failed_blob_creation_failed");} else {statusText = t("download_failed");}diff --git a/web/packages/gallery/components/utils/save-groups.ts b/web/packages/gallery/components/utils/save-groups.tsindex 07f87f1bd3..3331b5588e 100644--- a/web/packages/gallery/components/utils/save-groups.ts+++ b/web/packages/gallery/components/utils/save-groups.ts@@ -12,7 +12,7 @@ export interface SaveGroup {success: number;failed: number;canceller: AbortController;- failureReason?: "network_offline" | "file_error";+ failureReason?: "network_offline" | "file_error" | "blob_creation_failed";includeZipNumber?: boolean;isDownloadingZip?: boolean;currentPart?: number;diff --git a/web/packages/gallery/services/download-core.ts b/web/packages/gallery/services/download-core.tsindex efecfa3e07..8d5d727a7c 100644--- a/web/packages/gallery/services/download-core.ts+++ b/web/packages/gallery/services/download-core.ts@@ -406,7 +406,7 @@ class DownloadManagerCore {file: EnteFile,stream: ReadableStream<Uint8Array> | null,) {- const blob = await new Response(stream).blob();+ const blob = await readStreamToBlob(stream);if (blob.type) return blob;try {@@ -447,6 +447,24 @@ const wrapErrors = <T>(op: () => Promise<T>) =>throw new NetworkDownloadError(e);});+export class BlobCreationFailedError extends Error {+ constructor(cause: unknown) {+ let message = "Failed to create file blob";+ if (cause instanceof Error && !cause.stack) {+ message += `: ${cause.name}: ${cause.message}`;+ } else if (typeof cause === "string") {+ message += `: ${cause}`;+ }++ super(message, { cause });+ this.name = "BlobCreationFailedError";+ if (cause instanceof Error && cause.stack) {+ const stack = this.stack ?? `${this.name}: ${this.message}`;+ this.stack = `${stack}\nCaused by: ${cause.stack}`;+ }+ }+}+const createRenderableSourceURLs = async (file: EnteFile,originalFileURLPromise: Promise<string>,@@ -507,3 +525,63 @@ const createRenderableSourceURLs = async (}}};++class ErrorTrackingReader {+ error?: { error: unknown };+ cancelled = false;++ constructor(private reader: ReadableStreamDefaultReader<Uint8Array>) {}++ async read() {+ try {+ return await this.reader.read();+ } catch (e) {+ if (!this.cancelled) this.error = { error: e };+ throw e;+ }+ }++ cancel(reason: unknown) {+ this.cancelled = true;+ return this.reader.cancel(reason);+ }++ releaseLock() {+ this.reader.releaseLock();+ }+}++async function readStreamToBlob(+ stream: ReadableStream<Uint8Array> | null,+): Promise<Blob> {+ let reader: ErrorTrackingReader | undefined;+ if (stream) reader = new ErrorTrackingReader(stream.getReader());++ try {+ let body: ReadableStream<Uint8Array> | null = null;+ if (reader) body = copyReaderToStream(reader);+ return await new Response(body).blob();+ } catch (e) {+ if (reader?.error) throw reader.error.error;+ await reader?.cancel(e).catch(() => undefined);+ throw new BlobCreationFailedError(e);+ } finally {+ reader?.releaseLock();+ }+}++function copyReaderToStream(+ reader: ErrorTrackingReader,+): ReadableStream<Uint8Array> {+ return new ReadableStream<Uint8Array>({+ async pull(controller) {+ const result = await reader.read();+ if (reader.cancelled) return;+ if (result.done) controller.close();+ else controller.enqueue(result.value);+ },+ cancel(reason: unknown) {+ return reader.cancel(reason);+ },+ });+}diff --git a/web/packages/gallery/services/save-core.ts b/web/packages/gallery/services/save-core.tsindex a07328e88a..5495bd747f 100644--- a/web/packages/gallery/services/save-core.ts+++ b/web/packages/gallery/services/save-core.ts@@ -11,6 +11,7 @@ import type {AddSaveGroup,UpdateSaveGroup,} from "../components/utils/save-groups";+import { BlobCreationFailedError } from "./download-core";export interface BrowserSaveDownloader {fileBlob(file: EnteFile): Promise<Blob>;@@ -162,7 +163,14 @@ export const downloadAndSaveFilesWeb = async ({} catch (e) {log.error("File download failed", e);failedFiles.push(singleFile);- updateSaveGroup((g) => ({ ...g, failed: g.failed + 1 }));+ updateSaveGroup((g) => ({+ ...g,+ failed: g.failed + 1,+ failureReason:+ e instanceof BlobCreationFailedError+ ? "blob_creation_failed"+ : g.failureReason,+ }));}} else {nextZipBatchIndex = await saveAsZip(@@ -460,7 +468,10 @@ const saveAsZip = async (}updateSaveGroup((g) => ({...g,- failureReason: g.failureReason ?? "file_error",+ failureReason:+ e instanceof BlobCreationFailedError+ ? "blob_creation_failed"+ : (g.failureReason ?? "file_error"),}));}