From 8f80ddcc23be174f160c6f873024048c19ac0886 Mon Sep 17 00:00:00 2001 From: Alan Grainger Date: Fri, 21 Feb 2025 14:53:29 +0800 Subject: [PATCH] 1.7.3 #39 zip not created correctly --- README.md | 4 ++-- app/package-lock.json | 4 ++-- app/package.json | 2 +- app/src/render.ts | 9 +++++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d52e640..af9227b 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@

- Docker pulls + Docker pulls - Latest release + Latest release Open demo gallery

diff --git a/app/package-lock.json b/app/package-lock.json index 363aa64..1c7fb37 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "immich-public-proxy", - "version": "1.7.2", + "version": "1.7.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "immich-public-proxy", - "version": "1.7.2", + "version": "1.7.3", "license": "AGPL-3.0", "dependencies": { "archiver": "^7.0.1", diff --git a/app/package.json b/app/package.json index 131a94a..423940a 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "immich-public-proxy", - "version": "1.7.2", + "version": "1.7.3", "scripts": { "dev": "ts-node src/index.ts", "build": "npx tsc", diff --git a/app/src/render.ts b/app/src/render.ts index 5b468b1..eb64805 100644 --- a/app/src/render.ts +++ b/app/src/render.ts @@ -140,7 +140,7 @@ class Render { res.setHeader('Content-Type', 'application/zip') const title = this.title(share).replace(/[^\w .-]/g, '') + '.zip' res.setHeader('Content-Disposition', `attachment; filename="${title}"`) - const archive = archiver('zip', { zlib: { level: 9 } }) + const archive = archiver('zip', { zlib: { level: 6 } }) archive.pipe(res) for (const asset of share.assets) { const url = immich.buildUrl(immich.apiUrl() + '/assets/' + encodeURIComponent(asset.id) + '/original', { @@ -148,10 +148,15 @@ class Render { password: asset.password }) const data = await fetch(url) + // Check the response for validity + if (!data.ok) { + console.warn(`Failed to fetch asset: ${asset.id}`) + continue + } archive.append(Buffer.from(await data.arrayBuffer()), { name: asset.originalFileName || asset.id }) } await archive.finalize() - res.end() + archive.on('end', () => res.end()) } }