Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web][photos] Inline blob download helpers

aspizu3fac2df65bb4
diff --git a/web/packages/gallery/services/download-core.ts b/web/packages/gallery/services/download-core.ts
index 8d5d727a7c..684d5476e1 100644
--- a/web/packages/gallery/services/download-core.ts
+++ b/web/packages/gallery/services/download-core.ts
@@ -406,7 +406,45 @@ class DownloadManagerCore {
file: EnteFile,
stream: ReadableStream<Uint8Array> | null,
) {
- const blob = await readStreamToBlob(stream);
+ const reader = stream?.getReader();
+ let readError: unknown;
+ let hasReadError: boolean | undefined;
+ let cancelled = false;
+ let blob: Blob;
+ try {
+ let body: ReadableStream<Uint8Array> | null = null;
+ if (reader) {
+ body = new ReadableStream<Uint8Array>({
+ async pull(controller) {
+ let result: ReadableStreamReadResult<Uint8Array>;
+ try {
+ result = await reader.read();
+ } catch (e) {
+ if (!cancelled) {
+ readError = e;
+ hasReadError = true;
+ }
+ throw e;
+ }
+ if (cancelled) return;
+ if (result.done) controller.close();
+ else controller.enqueue(result.value);
+ },
+ cancel(reason: unknown) {
+ cancelled = true;
+ return reader.cancel(reason);
+ },
+ });
+ }
+ blob = await new Response(body).blob();
+ } catch (e) {
+ if (hasReadError) throw readError;
+ cancelled = true;
+ await reader?.cancel(e).catch(() => undefined);
+ throw new BlobCreationFailedError(e);
+ } finally {
+ reader?.releaseLock();
+ }
if (blob.type) return blob;
try {
@@ -525,63 +563,3 @@ 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.ts
index 5495bd747f..4524330eea 100644
--- a/web/packages/gallery/services/save-core.ts
+++ b/web/packages/gallery/services/save-core.ts
@@ -163,14 +163,13 @@ export const downloadAndSaveFilesWeb = async ({
} catch (e) {
log.error("File download failed", e);
failedFiles.push(singleFile);
- updateSaveGroup((g) => ({
- ...g,
- failed: g.failed + 1,
- failureReason:
- e instanceof BlobCreationFailedError
- ? "blob_creation_failed"
- : g.failureReason,
- }));
+ updateSaveGroup((g) => {
+ let failureReason = g.failureReason;
+ if (e instanceof BlobCreationFailedError) {
+ failureReason = "blob_creation_failed";
+ }
+ return { ...g, failed: g.failed + 1, failureReason };
+ });
}
} else {
nextZipBatchIndex = await saveAsZip(
@@ -466,13 +465,13 @@ const saveAsZip = async (
}));
return false;
}
- updateSaveGroup((g) => ({
- ...g,
- failureReason:
- e instanceof BlobCreationFailedError
- ? "blob_creation_failed"
- : (g.failureReason ?? "file_error"),
- }));
+ updateSaveGroup((g) => {
+ let failureReason = g.failureReason ?? "file_error";
+ if (e instanceof BlobCreationFailedError) {
+ failureReason = "blob_creation_failed";
+ }
+ return { ...g, failureReason };
+ });
}
return true;