diff --git a/Dockerfile b/Dockerfile index f9f671f..d6e1883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,4 @@ ENV NODE_ENV=production # Type checking is done in the repo before building the image. RUN npx tsc --noCheck -HEALTHCHECK --interval=30s --start-period=10s --timeout=5s CMD wget -q --spider http://localhost:3000/share/healthcheck || exit 1 - CMD ["node", "dist/index.js" ] diff --git a/README.md b/README.md index 5f3c1b5..07b7fbb 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.json b/app/package.json index 8bd39af..9577e7b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "immich-public-proxy", - "version": "1.9.1", + "version": "1.10.0", "scripts": { "dev": "ts-node src/index.ts", "build": "npx tsc", diff --git a/app/src/immich.ts b/app/src/immich.ts index ec0107a..6aa67e7 100644 --- a/app/src/immich.ts +++ b/app/src/immich.ts @@ -1,4 +1,13 @@ -import { Asset, AssetType, ImageSize, IncomingShareRequest, SharedLink, SharedLinkResult } from './types' +import { + Album, + AlbumType, + Asset, + AssetType, + ImageSize, + IncomingShareRequest, + SharedLink, + SharedLinkResult +} from './types' import dayjs from 'dayjs' import { addResponseHeaders, canDownload, getConfigOption, log } from './functions' import render from './render' @@ -94,14 +103,15 @@ class Immich { respondToInvalidRequest(res, 404) return } + const link = sharedLinkRes.link // Make sure there are some photo/video assets for this link - const link = sharedLinkRes.link + /* if (!link.assets.length) { log('No assets for key ' + request.key) respondToInvalidRequest(res, 404) return - } + } */ // Everything is ok - output the shared link data @@ -145,6 +155,25 @@ class Immich { if (res.status === 200) { // Normal response - get the shared assets link = jsonBody as SharedLink + + // For an album, we need to make a second request to Immich to populate + // the array of assets + if (link.type === AlbumType.album) { + const albumRes = await fetch(this.buildUrl(this.apiUrl() + '/albums/' + link?.album?.id, { + key, + password + })) + const album = await albumRes.json() as Album + if (!album?.id) { + log('Invalid album ID - ' + link?.album?.id) + return { + valid: false + } + } + // Replace the empty link.assets array with the array of assets from the album + link.assets = album.assets + } + link.password = password if (link.expiresAt && dayjs(link.expiresAt) < dayjs()) { // This link has expired diff --git a/app/src/types.ts b/app/src/types.ts index 0397b49..6dc31c7 100644 --- a/app/src/types.ts +++ b/app/src/types.ts @@ -9,6 +9,11 @@ export interface ExifInfo { description?: string; } +export enum AlbumType { + album = 'ALBUM', + individual = 'INDIVIDUAL' +} + export interface Asset { id: string; key: string; @@ -20,6 +25,11 @@ export interface Asset { exifInfo?: ExifInfo; } +export interface Album { + id: string; + assets: Asset[]; +} + export interface SharedLink { key: string; type: string; diff --git a/docker-compose.yml b/docker-compose.yml index 1e86a81..ac3d96f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,6 @@ services: environment: - IMMICH_URL=http://your-internal-immich-server:2283 healthcheck: - test: wget -q --spider http://localhost:3000/share/healthcheck || exit 1 + test: wget -q -T 10 --spider http://localhost:3000/share/healthcheck || exit 1 start_period: 10s timeout: 5s