Closes #686 - Add trekPhotoCache service: SHA1-keyed disk cache under uploads/photos/trek/, 1h TTL, in-flight dedup map to prevent stampedes on concurrent requests - Add migration 108: trek_photo_cache_meta table - Hook cache into streamPhoto for Immich/Synology thumbnail path; originals bypass cache - Add fetchImmichThumbnailBytes / fetchSynologyThumbnailBytes returning Buffer instead of piping, used by the cache layer - Add scheduler entry (every 2h + startup sweep) to evict expired disk files and DB rows via sweepExpired() - Client: convert journey tab conditional-mount to hidden-toggle so img elements stay in DOM across tab switches, preventing redundant thumbnail requests on rapid tab changes - Expose invalidateSize() on JourneyMapHandle; call it on map tab activation to fix Leaflet rendering in previously-hidden container
215 lines
7.7 KiB
TypeScript
215 lines
7.7 KiB
TypeScript
import { Response } from 'express';
|
|
import path from 'path';
|
|
import fs from 'fs';
|
|
import { db } from '../../db/database';
|
|
import type { TrekPhoto } from '../../types';
|
|
import { streamImmichAsset, fetchImmichThumbnailBytes, getAssetInfo as getImmichAssetInfo } from './immichService';
|
|
import { streamSynologyAsset, fetchSynologyThumbnailBytes, getSynologyAssetInfo } from './synologyService';
|
|
import type { ServiceResult, AssetInfo } from './helpersService';
|
|
import { fail, success } from './helpersService';
|
|
import { encrypt_api_key, decrypt_api_key } from '../apiKeyCrypto';
|
|
import * as photoCache from './trekPhotoCache';
|
|
|
|
// ── Lookup / Register ────────────────────────────────────────────────────
|
|
|
|
export function getOrCreateTrekPhoto(
|
|
provider: string,
|
|
assetId: string,
|
|
ownerId: number,
|
|
passphrase?: string,
|
|
): number {
|
|
const existing = db.prepare(
|
|
'SELECT id FROM trek_photos WHERE provider = ? AND asset_id = ? AND owner_id = ?'
|
|
).get(provider, assetId, ownerId) as { id: number } | undefined;
|
|
if (existing) {
|
|
if (passphrase) {
|
|
db.prepare('UPDATE trek_photos SET passphrase = ? WHERE id = ?')
|
|
.run(encrypt_api_key(passphrase), existing.id);
|
|
}
|
|
return existing.id;
|
|
}
|
|
|
|
const res = db.prepare(
|
|
'INSERT INTO trek_photos (provider, asset_id, owner_id, passphrase) VALUES (?, ?, ?, ?)'
|
|
).run(provider, assetId, ownerId, passphrase ? encrypt_api_key(passphrase) : null);
|
|
return Number(res.lastInsertRowid);
|
|
}
|
|
|
|
export function getOrCreateLocalTrekPhoto(
|
|
filePath: string,
|
|
thumbnailPath?: string | null,
|
|
width?: number | null,
|
|
height?: number | null,
|
|
): number {
|
|
const existing = db.prepare(
|
|
"SELECT id FROM trek_photos WHERE provider = 'local' AND file_path = ?"
|
|
).get(filePath) as { id: number } | undefined;
|
|
if (existing) return existing.id;
|
|
|
|
const res = db.prepare(
|
|
'INSERT INTO trek_photos (provider, file_path, thumbnail_path, width, height) VALUES (?, ?, ?, ?, ?)'
|
|
).run('local', filePath, thumbnailPath || null, width || null, height || null);
|
|
return Number(res.lastInsertRowid);
|
|
}
|
|
|
|
export function resolveTrekPhoto(photoId: number): TrekPhoto | null {
|
|
return db.prepare('SELECT * FROM trek_photos WHERE id = ?').get(photoId) as TrekPhoto | undefined || null;
|
|
}
|
|
|
|
// ── Streaming ────────────────────────────────────────────────────────────
|
|
|
|
async function streamCachedThumbnail(
|
|
res: Response,
|
|
photo: TrekPhoto,
|
|
fetchBytes: () => Promise<{ bytes: Buffer; contentType: string } | { error: string; status: number }>,
|
|
fallback: () => Promise<unknown>,
|
|
): Promise<void> {
|
|
const key = photoCache.cacheKey(photo.provider!, photo.asset_id!, 'thumbnail', photo.owner_id!);
|
|
|
|
if (photoCache.serveFresh(res, key)) return;
|
|
|
|
const existing = photoCache.getInFlight(key);
|
|
if (existing) {
|
|
const bytes = await existing;
|
|
if (bytes && photoCache.serveFresh(res, key)) return;
|
|
await fallback();
|
|
return;
|
|
}
|
|
|
|
const promise = fetchBytes().then(async result => {
|
|
if ('error' in result) return null;
|
|
await photoCache.put(key, result.bytes, result.contentType);
|
|
return result.bytes;
|
|
});
|
|
photoCache.setInFlight(key, promise);
|
|
|
|
const bytes = await promise;
|
|
if (bytes && photoCache.serveFresh(res, key)) return;
|
|
await fallback();
|
|
}
|
|
|
|
export async function streamPhoto(
|
|
res: Response,
|
|
userId: number,
|
|
photoId: number,
|
|
kind: 'thumbnail' | 'original',
|
|
): Promise<void> {
|
|
const photo = resolveTrekPhoto(photoId);
|
|
if (!photo) {
|
|
res.status(404).json({ error: 'Photo not found' });
|
|
return;
|
|
}
|
|
|
|
if (photo.file_path) {
|
|
const localPath = path.join(__dirname, '../../../uploads', photo.file_path);
|
|
if (fs.existsSync(localPath)) {
|
|
res.set('Cache-Control', 'public, max-age=86400');
|
|
res.sendFile(localPath);
|
|
return;
|
|
}
|
|
}
|
|
|
|
switch (photo.provider) {
|
|
case 'local': {
|
|
res.status(404).json({ error: 'File not found' });
|
|
return;
|
|
}
|
|
case 'immich': {
|
|
if (kind === 'thumbnail') {
|
|
await streamCachedThumbnail(
|
|
res, photo,
|
|
() => fetchImmichThumbnailBytes(userId, photo.asset_id!, photo.owner_id!),
|
|
() => streamImmichAsset(res, userId, photo.asset_id!, kind, photo.owner_id!),
|
|
);
|
|
return;
|
|
}
|
|
await streamImmichAsset(res, userId, photo.asset_id!, kind, photo.owner_id!);
|
|
return;
|
|
}
|
|
case 'synologyphotos': {
|
|
const passphrase = photo.passphrase ? (decrypt_api_key(photo.passphrase) || undefined) : undefined;
|
|
if (kind === 'thumbnail') {
|
|
await streamCachedThumbnail(
|
|
res, photo,
|
|
() => fetchSynologyThumbnailBytes(userId, photo.owner_id!, photo.asset_id!, passphrase),
|
|
() => streamSynologyAsset(res, userId, photo.owner_id!, photo.asset_id!, kind, undefined, passphrase),
|
|
);
|
|
return;
|
|
}
|
|
await streamSynologyAsset(res, userId, photo.owner_id!, photo.asset_id!, kind, undefined, passphrase);
|
|
return;
|
|
}
|
|
default:
|
|
res.status(400).json({ error: `Unknown provider: ${photo.provider}` });
|
|
}
|
|
}
|
|
|
|
// ── Asset Info ────────────────────────────────────────────────────────────
|
|
|
|
export async function getPhotoInfo(
|
|
userId: number,
|
|
photoId: number,
|
|
): Promise<ServiceResult<AssetInfo>> {
|
|
const photo = resolveTrekPhoto(photoId);
|
|
if (!photo) return fail('Photo not found', 404);
|
|
|
|
switch (photo.provider) {
|
|
case 'local': {
|
|
return success({
|
|
id: String(photo.id),
|
|
takenAt: photo.created_at,
|
|
city: null,
|
|
country: null,
|
|
width: photo.width,
|
|
height: photo.height,
|
|
fileName: photo.file_path?.split('/').pop() || null,
|
|
} as AssetInfo);
|
|
}
|
|
case 'immich': {
|
|
const result = await getImmichAssetInfo(userId, photo.asset_id!, photo.owner_id!);
|
|
if (result.error) return fail(result.error, result.status || 500);
|
|
return success(result.data as AssetInfo);
|
|
}
|
|
case 'synologyphotos': {
|
|
const passphrase = photo.passphrase ? (decrypt_api_key(photo.passphrase) || undefined) : undefined;
|
|
return getSynologyAssetInfo(userId, photo.asset_id!, photo.owner_id!, passphrase);
|
|
}
|
|
default:
|
|
return fail(`Unknown provider: ${photo.provider}`, 400);
|
|
}
|
|
}
|
|
|
|
// ── Update provider on existing trek_photo (for Immich upload sync) ─────
|
|
|
|
export function setTrekPhotoProvider(
|
|
trekPhotoId: number,
|
|
provider: string,
|
|
assetId: string,
|
|
ownerId: number,
|
|
): void {
|
|
db.prepare(
|
|
'UPDATE trek_photos SET provider = ?, asset_id = ?, owner_id = ? WHERE id = ?'
|
|
).run(provider, assetId, ownerId, trekPhotoId);
|
|
}
|
|
|
|
// ── Orphan cleanup ───────────────────────────────────────────────────────
|
|
|
|
export function deleteTrekPhotoIfOrphan(photoId: number): void {
|
|
const stillUsed = db.prepare(`
|
|
SELECT 1 FROM trip_photos WHERE photo_id = ?
|
|
UNION ALL
|
|
SELECT 1 FROM journey_photos WHERE photo_id = ?
|
|
LIMIT 1
|
|
`).get(photoId, photoId);
|
|
if (stillUsed) return;
|
|
db.prepare("DELETE FROM trek_photos WHERE id = ? AND provider != 'local'").run(photoId);
|
|
}
|
|
|
|
// ── Delete local file for a trek_photo ──────────────────────────────────
|
|
|
|
export function getTrekPhotoFilePath(photoId: number): string | null {
|
|
const photo = resolveTrekPhoto(photoId);
|
|
if (!photo || photo.provider !== 'local' || !photo.file_path) return null;
|
|
return path.join(__dirname, '../../../uploads', photo.file_path);
|
|
}
|