Add logging for #267

This commit is contained in:
Alan Grainger
2026-07-15 21:00:26 +12:00
parent 6ca4ad1d41
commit c371acbe43
2 changed files with 22 additions and 0 deletions
+9
View File
@@ -286,6 +286,15 @@ async function fetchShareByKey (key: string, password?: string, keyType: KeyType
// This link has expired // This link has expired
log('Expired link ' + key) log('Expired link ' + key)
} else { } else {
if (!Array.isArray(link.assets)) {
// Immich can return a shared link with no `assets` array (seen on
// 3.0.x INDIVIDUAL shares - see #267). The album path above always
// populates `link.assets`, so this only bites non-album shares.
// Treat a missing array as empty rather than letting `.filter` of
// undefined reject and take the whole process down.
log('Shared link ' + key + ' returned no assets array (type ' + link.type + ')')
link.assets = []
}
// Filter assets to exclude trashed assets // Filter assets to exclude trashed assets
link.assets = link.assets.filter(asset => !asset.isTrashed) link.assets = link.assets.filter(asset => !asset.isTrashed)
// Populate the shared assets with the public key/password // Populate the shared assets with the public key/password
+13
View File
@@ -134,6 +134,19 @@ describe('album timeline enumeration (Immich 3.0)', () => {
expect(result.valid).toBe(false) expect(result.valid).toBe(false)
}) })
it('does not crash when an individual share returns no assets array (#267)', async () => {
// Immich 3.0.x can return an INDIVIDUAL shared link with no `assets` key.
// `.filter` of undefined used to reject and take the container down.
const noAssets = { type: 'INDIVIDUAL', key: 'real-key', allowDownload: true }
vi.stubGlobal('fetch', vi.fn(async (url: string) => {
if (url.includes('/shared-links/me')) return jsonResponse(noAssets)
throw new Error('Unexpected fetch to ' + url)
}))
const result = await getShareByKey(uniqueKey(), undefined, KeyType.key)
expect(result.valid).toBe(true)
expect(result.link!.assets).toEqual([])
})
it('is invalid (not cached empty) when timeline enumeration fails upstream', async () => { it('is invalid (not cached empty) when timeline enumeration fails upstream', async () => {
vi.stubGlobal('fetch', vi.fn(async (url: string) => { vi.stubGlobal('fetch', vi.fn(async (url: string) => {
if (url.includes('/shared-links/me')) return jsonResponse(sharedLinkResponse()) if (url.includes('/shared-links/me')) return jsonResponse(sharedLinkResponse())